This sample demonstrates how to use an accelerometer sensor as input for
- a physics-based view. The input from the accelerometer is used to simulate a
- virtual surface, and a number of free-moving objects placed on top of it.
-
-
Any effects from the device's acceleration vector (including both gravity and
- temporary movement) will be translated to the on-screen particles.
-
-
diff --git a/samples/browseable/AccelerometerPlay/res/drawable-hdpi/ball.png b/samples/browseable/AccelerometerPlay/res/drawable-hdpi/ball.png
deleted file mode 100644
index e79e4d615..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/drawable-hdpi/ball.png and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/drawable-hdpi/wood.jpg b/samples/browseable/AccelerometerPlay/res/drawable-hdpi/wood.jpg
deleted file mode 100644
index 883f491d9..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/drawable-hdpi/wood.jpg and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/layout/main.xml b/samples/browseable/AccelerometerPlay/res/layout/main.xml
deleted file mode 100644
index c69b22294..000000000
--- a/samples/browseable/AccelerometerPlay/res/layout/main.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
diff --git a/samples/browseable/AccelerometerPlay/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/AccelerometerPlay/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 800c55629..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/AccelerometerPlay/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 1d6e9e55f..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/AccelerometerPlay/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 2989356b5..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/AccelerometerPlay/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 56b87a28d..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/AccelerometerPlay/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 500543319..000000000
Binary files a/samples/browseable/AccelerometerPlay/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AccelerometerPlay/res/values/strings.xml b/samples/browseable/AccelerometerPlay/res/values/strings.xml
deleted file mode 100644
index 6e3785e94..000000000
--- a/samples/browseable/AccelerometerPlay/res/values/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- AccelerometerPlay
-
diff --git a/samples/browseable/AccelerometerPlay/src/com.example.android.accelerometerplay/AccelerometerPlayActivity.java b/samples/browseable/AccelerometerPlay/src/com.example.android.accelerometerplay/AccelerometerPlayActivity.java
deleted file mode 100644
index b15685261..000000000
--- a/samples/browseable/AccelerometerPlay/src/com.example.android.accelerometerplay/AccelerometerPlayActivity.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.accelerometerplay;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.BitmapFactory.Options;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.Surface;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-
-/**
- * This is an example of using the accelerometer to integrate the device's
- * acceleration to a position using the Verlet method. This is illustrated with
- * a very simple particle system comprised of a few iron balls freely moving on
- * an inclined wooden table. The inclination of the virtual table is controlled
- * by the device's accelerometer.
- *
- * @see SensorManager
- * @see SensorEvent
- * @see Sensor
- */
-
-public class AccelerometerPlayActivity extends Activity {
-
- private SimulationView mSimulationView;
- private SensorManager mSensorManager;
- private PowerManager mPowerManager;
- private WindowManager mWindowManager;
- private Display mDisplay;
- private WakeLock mWakeLock;
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- // Get an instance of the SensorManager
- mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
-
- // Get an instance of the PowerManager
- mPowerManager = (PowerManager) getSystemService(POWER_SERVICE);
-
- // Get an instance of the WindowManager
- mWindowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
- mDisplay = mWindowManager.getDefaultDisplay();
-
- // Create a bright wake lock
- mWakeLock = mPowerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, getClass()
- .getName());
-
- // instantiate our simulation view and set it as the activity's content
- mSimulationView = new SimulationView(this);
- mSimulationView.setBackgroundResource(R.drawable.wood);
- setContentView(mSimulationView);
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- /*
- * when the activity is resumed, we acquire a wake-lock so that the
- * screen stays on, since the user will likely not be fiddling with the
- * screen or buttons.
- */
- mWakeLock.acquire();
-
- // Start the simulation
- mSimulationView.startSimulation();
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- /*
- * When the activity is paused, we make sure to stop the simulation,
- * release our sensor resources and wake locks
- */
-
- // Stop the simulation
- mSimulationView.stopSimulation();
-
- // and release our wake-lock
- mWakeLock.release();
- }
-
- class SimulationView extends FrameLayout implements SensorEventListener {
- // diameter of the balls in meters
- private static final float sBallDiameter = 0.004f;
- private static final float sBallDiameter2 = sBallDiameter * sBallDiameter;
-
- private final int mDstWidth;
- private final int mDstHeight;
-
- private Sensor mAccelerometer;
- private long mLastT;
-
- private float mXDpi;
- private float mYDpi;
- private float mMetersToPixelsX;
- private float mMetersToPixelsY;
- private float mXOrigin;
- private float mYOrigin;
- private float mSensorX;
- private float mSensorY;
- private float mHorizontalBound;
- private float mVerticalBound;
- private final ParticleSystem mParticleSystem;
- /*
- * Each of our particle holds its previous and current position, its
- * acceleration. for added realism each particle has its own friction
- * coefficient.
- */
- class Particle extends View {
- private float mPosX = (float) Math.random();
- private float mPosY = (float) Math.random();
- private float mVelX;
- private float mVelY;
-
- public Particle(Context context) {
- super(context);
- }
-
- public Particle(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public Particle(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- public Particle(Context context, AttributeSet attrs, int defStyleAttr,
- int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- }
-
- public void computePhysics(float sx, float sy, float dT) {
-
- final float ax = -sx/5;
- final float ay = -sy/5;
-
- mPosX += mVelX * dT + ax * dT * dT / 2;
- mPosY += mVelY * dT + ay * dT * dT / 2;
-
- mVelX += ax * dT;
- mVelY += ay * dT;
- }
-
- /*
- * Resolving constraints and collisions with the Verlet integrator
- * can be very simple, we simply need to move a colliding or
- * constrained particle in such way that the constraint is
- * satisfied.
- */
- public void resolveCollisionWithBounds() {
- final float xmax = mHorizontalBound;
- final float ymax = mVerticalBound;
- final float x = mPosX;
- final float y = mPosY;
- if (x > xmax) {
- mPosX = xmax;
- mVelX = 0;
- } else if (x < -xmax) {
- mPosX = -xmax;
- mVelX = 0;
- }
- if (y > ymax) {
- mPosY = ymax;
- mVelY = 0;
- } else if (y < -ymax) {
- mPosY = -ymax;
- mVelY = 0;
- }
- }
- }
-
- /*
- * A particle system is just a collection of particles
- */
- class ParticleSystem {
- static final int NUM_PARTICLES = 5;
- private Particle mBalls[] = new Particle[NUM_PARTICLES];
-
- ParticleSystem() {
- /*
- * Initially our particles have no speed or acceleration
- */
- for (int i = 0; i < mBalls.length; i++) {
- mBalls[i] = new Particle(getContext());
- mBalls[i].setBackgroundResource(R.drawable.ball);
- mBalls[i].setLayerType(LAYER_TYPE_HARDWARE, null);
- addView(mBalls[i], new ViewGroup.LayoutParams(mDstWidth, mDstHeight));
- }
- }
-
- /*
- * Update the position of each particle in the system using the
- * Verlet integrator.
- */
- private void updatePositions(float sx, float sy, long timestamp) {
- final long t = timestamp;
- if (mLastT != 0) {
- final float dT = (float) (t - mLastT) / 1000.f /** (1.0f / 1000000000.0f)*/;
- final int count = mBalls.length;
- for (int i = 0; i < count; i++) {
- Particle ball = mBalls[i];
- ball.computePhysics(sx, sy, dT);
- }
- }
- mLastT = t;
- }
-
- /*
- * Performs one iteration of the simulation. First updating the
- * position of all the particles and resolving the constraints and
- * collisions.
- */
- public void update(float sx, float sy, long now) {
- // update the system's positions
- updatePositions(sx, sy, now);
-
- // We do no more than a limited number of iterations
- final int NUM_MAX_ITERATIONS = 10;
-
- /*
- * Resolve collisions, each particle is tested against every
- * other particle for collision. If a collision is detected the
- * particle is moved away using a virtual spring of infinite
- * stiffness.
- */
- boolean more = true;
- final int count = mBalls.length;
- for (int k = 0; k < NUM_MAX_ITERATIONS && more; k++) {
- more = false;
- for (int i = 0; i < count; i++) {
- Particle curr = mBalls[i];
- for (int j = i + 1; j < count; j++) {
- Particle ball = mBalls[j];
- float dx = ball.mPosX - curr.mPosX;
- float dy = ball.mPosY - curr.mPosY;
- float dd = dx * dx + dy * dy;
- // Check for collisions
- if (dd <= sBallDiameter2) {
- /*
- * add a little bit of entropy, after nothing is
- * perfect in the universe.
- */
- dx += ((float) Math.random() - 0.5f) * 0.0001f;
- dy += ((float) Math.random() - 0.5f) * 0.0001f;
- dd = dx * dx + dy * dy;
- // simulate the spring
- final float d = (float) Math.sqrt(dd);
- final float c = (0.5f * (sBallDiameter - d)) / d;
- final float effectX = dx * c;
- final float effectY = dy * c;
- curr.mPosX -= effectX;
- curr.mPosY -= effectY;
- ball.mPosX += effectX;
- ball.mPosY += effectY;
- more = true;
- }
- }
- curr.resolveCollisionWithBounds();
- }
- }
- }
-
- public int getParticleCount() {
- return mBalls.length;
- }
-
- public float getPosX(int i) {
- return mBalls[i].mPosX;
- }
-
- public float getPosY(int i) {
- return mBalls[i].mPosY;
- }
- }
-
- public void startSimulation() {
- /*
- * It is not necessary to get accelerometer events at a very high
- * rate, by using a slower rate (SENSOR_DELAY_UI), we get an
- * automatic low-pass filter, which "extracts" the gravity component
- * of the acceleration. As an added benefit, we use less power and
- * CPU resources.
- */
- mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_GAME);
- }
-
- public void stopSimulation() {
- mSensorManager.unregisterListener(this);
- }
-
- public SimulationView(Context context) {
- super(context);
- mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-
- DisplayMetrics metrics = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getMetrics(metrics);
- mXDpi = metrics.xdpi;
- mYDpi = metrics.ydpi;
- mMetersToPixelsX = mXDpi / 0.0254f;
- mMetersToPixelsY = mYDpi / 0.0254f;
-
- // rescale the ball so it's about 0.5 cm on screen
- mDstWidth = (int) (sBallDiameter * mMetersToPixelsX + 0.5f);
- mDstHeight = (int) (sBallDiameter * mMetersToPixelsY + 0.5f);
- mParticleSystem = new ParticleSystem();
-
- Options opts = new Options();
- opts.inDither = true;
- opts.inPreferredConfig = Bitmap.Config.RGB_565;
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- // compute the origin of the screen relative to the origin of
- // the bitmap
- mXOrigin = (w - mDstWidth) * 0.5f;
- mYOrigin = (h - mDstHeight) * 0.5f;
- mHorizontalBound = ((w / mMetersToPixelsX - sBallDiameter) * 0.5f);
- mVerticalBound = ((h / mMetersToPixelsY - sBallDiameter) * 0.5f);
- }
-
- @Override
- public void onSensorChanged(SensorEvent event) {
- if (event.sensor.getType() != Sensor.TYPE_ACCELEROMETER)
- return;
- /*
- * record the accelerometer data, the event's timestamp as well as
- * the current time. The latter is needed so we can calculate the
- * "present" time during rendering. In this application, we need to
- * take into account how the screen is rotated with respect to the
- * sensors (which always return data in a coordinate space aligned
- * to with the screen in its native orientation).
- */
-
- switch (mDisplay.getRotation()) {
- case Surface.ROTATION_0:
- mSensorX = event.values[0];
- mSensorY = event.values[1];
- break;
- case Surface.ROTATION_90:
- mSensorX = -event.values[1];
- mSensorY = event.values[0];
- break;
- case Surface.ROTATION_180:
- mSensorX = -event.values[0];
- mSensorY = -event.values[1];
- break;
- case Surface.ROTATION_270:
- mSensorX = event.values[1];
- mSensorY = -event.values[0];
- break;
- }
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- /*
- * Compute the new position of our object, based on accelerometer
- * data and present time.
- */
- final ParticleSystem particleSystem = mParticleSystem;
- final long now = System.currentTimeMillis();
- final float sx = mSensorX;
- final float sy = mSensorY;
-
- particleSystem.update(sx, sy, now);
-
- final float xc = mXOrigin;
- final float yc = mYOrigin;
- final float xs = mMetersToPixelsX;
- final float ys = mMetersToPixelsY;
- final int count = particleSystem.getParticleCount();
- for (int i = 0; i < count; i++) {
- /*
- * We transform the canvas so that the coordinate system matches
- * the sensors coordinate system with the origin in the center
- * of the screen and the unit is the meter.
- */
- final float x = xc + particleSystem.getPosX(i) * xs;
- final float y = yc - particleSystem.getPosY(i) * ys;
- particleSystem.mBalls[i].setTranslationX(x);
- particleSystem.mBalls[i].setTranslationY(y);
- }
-
- // and make sure to redraw asap
- invalidate();
- }
-
- @Override
- public void onAccuracyChanged(Sensor sensor, int accuracy) {
- }
- }
-}
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/_index.jd b/samples/browseable/ActionBarCompat-ShareActionProvider/_index.jd
deleted file mode 100644
index d9df53688..000000000
--- a/samples/browseable/ActionBarCompat-ShareActionProvider/_index.jd
+++ /dev/null
@@ -1,11 +0,0 @@
-
-page.tags="ActionBarCompat-ShareActionProvider"
-sample.group=UI
-@jd:body
-
-
-
- This sample shows you how a provide a context-sensitive ShareActionProvider with
- ActionBarCompat, backwards compatible to API v7.
-
-
diff --git a/samples/browseable/ActiveNotifications/res/values/strings.xml b/samples/browseable/ActiveNotifications/res/values/strings.xml
index a4275fdf2..783a0744b 100644
--- a/samples/browseable/ActiveNotifications/res/values/strings.xml
+++ b/samples/browseable/ActiveNotifications/res/values/strings.xml
@@ -16,8 +16,8 @@
-->
Add a notification
- Active Notifications: %1$s
+ Active Notifications: %1$dUpdate countThis is a sample notification.
- There are %s ActiveNotifications.
+ There are %d ActiveNotifications.
diff --git a/samples/browseable/ActiveNotifications/src/com.example.android.activenotifications/ActiveNotificationsFragment.java b/samples/browseable/ActiveNotifications/src/com.example.android.activenotifications/ActiveNotificationsFragment.java
index db0dbac6f..d752a36f2 100644
--- a/samples/browseable/ActiveNotifications/src/com.example.android.activenotifications/ActiveNotificationsFragment.java
+++ b/samples/browseable/ActiveNotifications/src/com.example.android.activenotifications/ActiveNotificationsFragment.java
@@ -129,23 +129,12 @@ public class ActiveNotificationsFragment extends Fragment {
* Adds/updates/removes the notification summary as necessary.
*/
protected void updateNotificationSummary() {
- final StatusBarNotification[] activeNotifications = mNotificationManager
- .getActiveNotifications();
-
- int numberOfNotifications = activeNotifications.length;
- // Since the notifications might include a summary notification remove it from the count if
- // it is present.
- for (StatusBarNotification notification : activeNotifications) {
- if (notification.getId() == NOTIFICATION_GROUP_SUMMARY_ID) {
- numberOfNotifications--;
- break;
- }
- }
+ int numberOfNotifications = getNumberOfNotifications();
if (numberOfNotifications > 1) {
// Add/update the notification summary.
String notificationContent = getString(R.string.sample_notification_summary_content,
- "" + numberOfNotifications);
+ numberOfNotifications);
final NotificationCompat.Builder builder = new NotificationCompat.Builder(getActivity())
.setSmallIcon(R.mipmap.ic_notification)
.setStyle(new NotificationCompat.BigTextStyle()
@@ -165,12 +154,7 @@ public class ActiveNotificationsFragment extends Fragment {
* display them to the user.
*/
protected void updateNumberOfNotifications() {
- // [BEGIN get_active_notifications]
- // Query the currently displayed notifications.
- final StatusBarNotification[] activeNotifications = mNotificationManager
- .getActiveNotifications();
- // [END get_active_notifications]
- final int numberOfNotifications = activeNotifications.length;
+ final int numberOfNotifications = getNumberOfNotifications();
mNumberOfNotifications.setText(getString(R.string.active_notifications,
numberOfNotifications));
Log.i(TAG, getString(R.string.active_notifications, numberOfNotifications));
@@ -190,4 +174,21 @@ public class ActiveNotificationsFragment extends Fragment {
}
return notificationId;
}
+
+ private int getNumberOfNotifications() {
+ // [BEGIN get_active_notifications]
+ // Query the currently displayed notifications.
+ final StatusBarNotification[] activeNotifications = mNotificationManager
+ .getActiveNotifications();
+ // [END get_active_notifications]
+
+ // Since the notifications might include a summary notification remove it from the count if
+ // it is present.
+ for (StatusBarNotification notification : activeNotifications) {
+ if (notification.getId() == NOTIFICATION_GROUP_SUMMARY_ID) {
+ return activeNotifications.length - 1;
+ }
+ }
+ return activeNotifications.length;
+ }
}
diff --git a/samples/browseable/AdvancedImmersiveMode/res/layout/fragment_flags.xml b/samples/browseable/AdvancedImmersiveMode/res/layout/fragment_flags.xml
index 2c74e83f0..c59b3b393 100644
--- a/samples/browseable/AdvancedImmersiveMode/res/layout/fragment_flags.xml
+++ b/samples/browseable/AdvancedImmersiveMode/res/layout/fragment_flags.xml
@@ -1,43 +1,44 @@
+ android:text="@string/enable_low_profile_mode" />
+ android:text="@string/hide_navigation_bar" />
+ android:text="@string/hide_status_bar" />
+ android:text="@string/enable_immersive_mode" />
+ android:text="@string/enable_immersive_mode_sticky" />
@@ -45,25 +46,24 @@
android:layout_marginTop="@dimen/margin_large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Common flag presets"/>
-
+
+
-
-
-
\ No newline at end of file
diff --git a/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml b/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml
new file mode 100644
index 000000000..6cfd28c78
--- /dev/null
+++ b/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml
@@ -0,0 +1,27 @@
+
+
+
+ Enable Low Profile Mode
+ Hide Navigation bar
+ Hide Status Bar
+ Enable Immersive Mode
+ Enable Immersive Mode (Sticky)
+ Do things!
+ Common flag presets
+ Immersive Mode
+ Leanback Mode
+
\ No newline at end of file
diff --git a/samples/browseable/AgendaData/Application/AndroidManifest.xml b/samples/browseable/AgendaData/Application/AndroidManifest.xml
index ad6cccde8..083b223dd 100644
--- a/samples/browseable/AgendaData/Application/AndroidManifest.xml
+++ b/samples/browseable/AgendaData/Application/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.agendadata">
+ android:targetSdkVersion="25" />
diff --git a/samples/browseable/AgendaData/Wearable/AndroidManifest.xml b/samples/browseable/AgendaData/Wearable/AndroidManifest.xml
index 87bed7061..f8bbdd80b 100644
--- a/samples/browseable/AgendaData/Wearable/AndroidManifest.xml
+++ b/samples/browseable/AgendaData/Wearable/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.agendadata" >
+ android:targetSdkVersion="25" />
@@ -27,6 +27,10 @@
android:label="@string/app_name"
>
+
+
diff --git a/samples/browseable/AlwaysOn/AndroidManifest.xml b/samples/browseable/AlwaysOn/AndroidManifest.xml
index 12c4b03a5..c105808c9 100644
--- a/samples/browseable/AlwaysOn/AndroidManifest.xml
+++ b/samples/browseable/AlwaysOn/AndroidManifest.xml
@@ -25,7 +25,12 @@
+ android:label="@string/app_name"
+ android:theme="@android:style/Theme.DeviceDefault">
+
+
diff --git a/samples/browseable/AppRestrictionEnforcer/AndroidManifest.xml b/samples/browseable/AppRestrictionEnforcer/AndroidManifest.xml
index c66b4b33e..1cd6ae851 100644
--- a/samples/browseable/AppRestrictionEnforcer/AndroidManifest.xml
+++ b/samples/browseable/AppRestrictionEnforcer/AndroidManifest.xml
@@ -16,15 +16,17 @@
-->
+ android:theme="@style/AppTheme"
+ tools:ignore="GoogleAppIndexingWarning">
This sample demonstrates how to set restrictions to other apps as a profile owner.
- Use AppRestrictionSchema sample as a app with available restrictions.
+ Use the AppRestrictionSchema sample to set restrictions.
diff --git a/samples/browseable/AppRestrictionEnforcer/res/drawable-hdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index e7bd161ef..000000000
Binary files a/samples/browseable/AppRestrictionEnforcer/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/drawable-mdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 4c42c9c45..000000000
Binary files a/samples/browseable/AppRestrictionEnforcer/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 3ec336888..000000000
Binary files a/samples/browseable/AppRestrictionEnforcer/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 730f80cd2..000000000
Binary files a/samples/browseable/AppRestrictionEnforcer/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_setup_profile.xml b/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_setup_profile.xml
index 8fde91fc3..c21939514 100644
--- a/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_setup_profile.xml
+++ b/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_setup_profile.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.example.android.basicmanagedprofile.MainActivity.MainFragment">
+ tools:context="com.example.android.apprestrictionenforcer.MainActivity">
-
-
diff --git a/samples/browseable/AppRestrictionEnforcer/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..7e0b8c8c3
Binary files /dev/null and b/samples/browseable/AppRestrictionEnforcer/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..963c36e1e
Binary files /dev/null and b/samples/browseable/AppRestrictionEnforcer/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..6e0f52d5d
Binary files /dev/null and b/samples/browseable/AppRestrictionEnforcer/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..3ff049c1b
Binary files /dev/null and b/samples/browseable/AppRestrictionEnforcer/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/AppRestrictionEnforcer/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..9bf83de04
Binary files /dev/null and b/samples/browseable/AppRestrictionEnforcer/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionEnforcer/res/values/base-strings.xml b/samples/browseable/AppRestrictionEnforcer/res/values/base-strings.xml
index dbf51bdf6..9e3dc41da 100644
--- a/samples/browseable/AppRestrictionEnforcer/res/values/base-strings.xml
+++ b/samples/browseable/AppRestrictionEnforcer/res/values/base-strings.xml
@@ -22,7 +22,7 @@
This sample demonstrates how to set restrictions to other apps as a profile owner.
- Use AppRestrictionSchema sample as a app with available restrictions.
+ Use the AppRestrictionSchema sample to set restrictions.
]]>
diff --git a/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml b/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml
index 07e1c85c7..88fe8cc73 100644
--- a/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml
+++ b/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml
@@ -22,8 +22,6 @@
AppRestrictionSchema needs reinstalling.Activate AppRestrictionSchemaAllow AppRestrictionSchema to say hello:
- Allowed
- DisallowedAppRestrictionEnforcer Message: Number:
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/Constants.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/Constants.java
index bb4e958c7..0f8a1e34b 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/Constants.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/Constants.java
@@ -21,7 +21,6 @@ public interface Constants {
/**
* Package name of the AppRestrictionSchema sample.
*/
- public static final String PACKAGE_NAME_APP_RESTRICTION_SCHEMA
- = "com.example.android.apprestrictionschema";
+ String PACKAGE_NAME_APP_RESTRICTION_SCHEMA = "com.example.android.apprestrictionschema";
}
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java
index 091a0a889..a5f6628a8 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java
@@ -16,7 +16,6 @@
package com.example.android.apprestrictionenforcer;
-import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.Nullable;
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java
index 85eace96b..e250e7417 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java
@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
@@ -38,9 +39,16 @@ public class MainActivity extends FragmentActivity implements StatusFragment.Sta
showSetupProfile();
} else {
try {
+ int packageFlags;
+ if (Build.VERSION.SDK_INT < 24) {
+ //noinspection deprecation
+ packageFlags = PackageManager.GET_UNINSTALLED_PACKAGES;
+ } else {
+ packageFlags = PackageManager.MATCH_UNINSTALLED_PACKAGES;
+ }
ApplicationInfo info = packageManager.getApplicationInfo(
Constants.PACKAGE_NAME_APP_RESTRICTION_SCHEMA,
- PackageManager.GET_UNINSTALLED_PACKAGES);
+ packageFlags);
if (0 == (info.flags & ApplicationInfo.FLAG_INSTALLED)) {
// Need to reinstall the sample app
showStatusProfile();
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java
index 29c36d410..28bd1dad7 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java
@@ -80,6 +80,7 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen
intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
EnforcerDeviceAdminReceiver.getComponentName(activity));
} else {
+ //noinspection deprecation
intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
activity.getApplicationContext().getPackageName());
intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity));
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/StatusFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/StatusFragment.java
index f4a4eb796..ed3258071 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/StatusFragment.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/StatusFragment.java
@@ -20,6 +20,7 @@ import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
@@ -85,9 +86,16 @@ public class StatusFragment extends Fragment implements View.OnClickListener {
private void updateUi(Activity activity) {
PackageManager packageManager = activity.getPackageManager();
try {
+ int packageFlags;
+ if (Build.VERSION.SDK_INT < 24) {
+ //noinspection deprecation
+ packageFlags = PackageManager.GET_UNINSTALLED_PACKAGES;
+ } else {
+ packageFlags = PackageManager.MATCH_UNINSTALLED_PACKAGES;
+ }
ApplicationInfo info = packageManager.getApplicationInfo(
Constants.PACKAGE_NAME_APP_RESTRICTION_SCHEMA,
- PackageManager.GET_UNINSTALLED_PACKAGES);
+ packageFlags);
DevicePolicyManager devicePolicyManager =
(DevicePolicyManager) activity.getSystemService(Activity.DEVICE_POLICY_SERVICE);
if ((info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
diff --git a/samples/browseable/AppRestrictionSchema/AndroidManifest.xml b/samples/browseable/AppRestrictionSchema/AndroidManifest.xml
index f8bbccc56..6ef22ede6 100644
--- a/samples/browseable/AppRestrictionSchema/AndroidManifest.xml
+++ b/samples/browseable/AppRestrictionSchema/AndroidManifest.xml
@@ -16,17 +16,17 @@
-->
-
-
+ android:theme="@style/AppTheme"
+ tools:ignore="GoogleAppIndexingWarning">
-
-
diff --git a/samples/browseable/AppRestrictionSchema/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/AppRestrictionSchema/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..419e62861
Binary files /dev/null and b/samples/browseable/AppRestrictionSchema/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionSchema/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/AppRestrictionSchema/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..16ec1ce20
Binary files /dev/null and b/samples/browseable/AppRestrictionSchema/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionSchema/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/AppRestrictionSchema/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..4a1929ee2
Binary files /dev/null and b/samples/browseable/AppRestrictionSchema/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionSchema/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/AppRestrictionSchema/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b35996420
Binary files /dev/null and b/samples/browseable/AppRestrictionSchema/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionSchema/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/AppRestrictionSchema/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0c3cf753a
Binary files /dev/null and b/samples/browseable/AppRestrictionSchema/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java b/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java
index f15bd9d41..3f4cea012 100644
--- a/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java
+++ b/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java
@@ -81,17 +81,11 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
mTextNumber = (TextView) view.findViewById(R.id.your_number);
mTextRank = (TextView) view.findViewById(R.id.your_rank);
mTextApprovals = (TextView) view.findViewById(R.id.approvals_you_have);
- View bundleSeparator = view.findViewById(R.id.bundle_separator);
- View bundleArraySeparator = view.findViewById(R.id.bundle_array_separator);
mTextItems = (TextView) view.findViewById(R.id.your_items);
mButtonSayHello.setOnClickListener(this);
if (BUNDLE_SUPPORTED) {
- bundleSeparator.setVisibility(View.VISIBLE);
- bundleArraySeparator.setVisibility(View.VISIBLE);
mTextItems.setVisibility(View.VISIBLE);
} else {
- bundleSeparator.setVisibility(View.GONE);
- bundleArraySeparator.setVisibility(View.GONE);
mTextItems.setVisibility(View.GONE);
}
}
diff --git a/samples/browseable/AppRestrictions/AndroidManifest.xml b/samples/browseable/AppRestrictions/AndroidManifest.xml
index ddac9cfd1..5c0ca6489 100644
--- a/samples/browseable/AppRestrictions/AndroidManifest.xml
+++ b/samples/browseable/AppRestrictions/AndroidManifest.xml
@@ -18,6 +18,7 @@
@@ -25,7 +26,9 @@
+ android:icon="@mipmap/ic_launcher"
+ android:allowBackup="true"
+ tools:ignore="GoogleAppIndexingWarning">
diff --git a/samples/browseable/AppRestrictions/res/drawable-hdpi/ic_launcher.png b/samples/browseable/AppRestrictions/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index f36c473a1..000000000
Binary files a/samples/browseable/AppRestrictions/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictions/res/drawable-mdpi/ic_launcher.png b/samples/browseable/AppRestrictions/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 5ab2e0d33..000000000
Binary files a/samples/browseable/AppRestrictions/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictions/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/AppRestrictions/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index 76228388e..000000000
Binary files a/samples/browseable/AppRestrictions/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictions/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/AppRestrictions/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index 7f55feff2..000000000
Binary files a/samples/browseable/AppRestrictions/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/browseable/AppRestrictions/res/layout/main.xml b/samples/browseable/AppRestrictions/res/layout/main.xml
index 55e2c8eb4..5228754f7 100644
--- a/samples/browseable/AppRestrictions/res/layout/main.xml
+++ b/samples/browseable/AppRestrictions/res/layout/main.xml
@@ -18,7 +18,7 @@ limitations under the License.
android:layout_height="match_parent">
-
+ android:layout_marginStart="20dp">
+ android:layout_marginStart="20dp">
+ android:layout_marginStart="20dp">
set = new HashSet();
- for (String value : entry.getAllSelectedStrings()) {
- set.add(value);
- }
+ HashSet set = new HashSet<>();
+ Collections.addAll(set, entry.getAllSelectedStrings());
mMultiPref.setValues(set);
mMultiEntry = entry;
}
}
} else {
- mRestrictions = new ArrayList();
+ mRestrictions = new ArrayList<>();
// Initializes the boolean restriction entry and updates its corresponding shared
// preference value.
@@ -155,13 +154,11 @@ public class CustomRestrictionsFragment extends PreferenceFragment
GetRestrictionsReceiver.KEY_MULTI_SELECT));
mMultiEntry.setType(RestrictionEntry.TYPE_MULTI_SELECT);
if (mMultiEntry.getAllSelectedStrings() != null) {
- HashSet set = new HashSet();
+ HashSet set = new HashSet<>();
final String[] values = mRestrictionsBundle.getStringArray(
GetRestrictionsReceiver.KEY_MULTI_SELECT);
if (values != null) {
- for (String value : values) {
- set.add(value);
- }
+ Collections.addAll(set, values);
}
mMultiPref.setValues(set);
}
@@ -173,7 +170,7 @@ public class CustomRestrictionsFragment extends PreferenceFragment
// activity finishes.
Intent intent = new Intent(getActivity().getIntent());
intent.putParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS_LIST,
- new ArrayList(mRestrictions));
+ new ArrayList<>(mRestrictions));
getActivity().setResult(Activity.RESULT_OK, intent);
}
@@ -183,9 +180,12 @@ public class CustomRestrictionsFragment extends PreferenceFragment
mBooleanEntry.setSelectedState((Boolean) newValue);
} else if (preference == mChoicePref) {
mChoiceEntry.setSelectedString((String) newValue);
- } else if (preference == mMultiPref) {
- String[] selectedStrings = new String[((Set)newValue).size()];
+ } else if (preference == mMultiPref && newValue instanceof Set) {
+ // newValue is a Set, skip the lint warning.
+ //noinspection unchecked
+ String[] selectedStrings = new String[((Set) newValue).size()];
int i = 0;
+ //noinspection unchecked
for (String value : (Set) newValue) {
selectedStrings[i++] = value;
}
@@ -195,7 +195,7 @@ public class CustomRestrictionsFragment extends PreferenceFragment
// Saves all the app restriction configuration changes from the custom activity.
Intent intent = new Intent(getActivity().getIntent());
intent.putParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS_LIST,
- new ArrayList(mRestrictions));
+ new ArrayList<>(mRestrictions));
getActivity().setResult(Activity.RESULT_OK, intent);
return true;
}
diff --git a/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/GetRestrictionsReceiver.java b/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/GetRestrictionsReceiver.java
index bb5a28391..a17a6c118 100644
--- a/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/GetRestrictionsReceiver.java
+++ b/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/GetRestrictionsReceiver.java
@@ -88,7 +88,7 @@ public class GetRestrictionsReceiver extends BroadcastReceiver {
// Demonstrates the creation of standard app restriction types: boolean, single choice, and
// multi-select.
private ArrayList initRestrictions(Context context) {
- ArrayList newRestrictions = new ArrayList();
+ ArrayList newRestrictions = new ArrayList<>();
Resources res = context.getResources();
RestrictionEntry reBoolean = new RestrictionEntry(KEY_BOOLEAN, false);
diff --git a/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/MainActivity.java b/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/MainActivity.java
index 57c443906..1e76fbda8 100644
--- a/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/MainActivity.java
+++ b/samples/browseable/AppRestrictions/src/com.example.android.apprestrictions/MainActivity.java
@@ -120,12 +120,10 @@ public class MainActivity extends Activity {
*
* This flag is used by {@code GetRestrictionsReceiver} to determine if a custom app
* restriction activity should be used.
- *
- * @param view
*/
public void onCustomClicked(View view) {
final SharedPreferences.Editor editor =
PreferenceManager.getDefaultSharedPreferences(this).edit();
- editor.putBoolean(CUSTOM_CONFIG_KEY, mCustomConfig.isChecked()).commit();
+ editor.putBoolean(CUSTOM_CONFIG_KEY, mCustomConfig.isChecked()).apply();
}
}
diff --git a/samples/browseable/AppShortcuts/AndroidManifest.xml b/samples/browseable/AppShortcuts/AndroidManifest.xml
index 9dfc7a3a8..183bc84d9 100644
--- a/samples/browseable/AppShortcuts/AndroidManifest.xml
+++ b/samples/browseable/AppShortcuts/AndroidManifest.xml
@@ -23,7 +23,8 @@
diff --git a/samples/browseable/AppShortcuts/res/drawable-nodpi/app.png b/samples/browseable/AppShortcuts/res/drawable-nodpi/app.png
deleted file mode 100644
index 39ca2f973..000000000
Binary files a/samples/browseable/AppShortcuts/res/drawable-nodpi/app.png and /dev/null differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/AppShortcuts/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 000000000..cb86b9743
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-hdpi/ic_launcher_round.png b/samples/browseable/AppShortcuts/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..7502f5d60
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/AppShortcuts/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 000000000..bfeec7a38
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-mdpi/ic_launcher_round.png b/samples/browseable/AppShortcuts/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..13ca6d75f
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/AppShortcuts/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 000000000..358442e05
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-xhdpi/ic_launcher_round.png b/samples/browseable/AppShortcuts/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..ff93f4d14
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/AppShortcuts/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 000000000..c99a1a000
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-xxhdpi/ic_launcher_round.png b/samples/browseable/AppShortcuts/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..8b642db83
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/AppShortcuts/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 000000000..3bcda818b
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/samples/browseable/AppShortcuts/res/mipmap-xxxhdpi/ic_launcher_round.png b/samples/browseable/AppShortcuts/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..a49362e32
Binary files /dev/null and b/samples/browseable/AppShortcuts/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/samples/browseable/AsymmetricFingerprintDialog/AndroidManifest.xml b/samples/browseable/AsymmetricFingerprintDialog/AndroidManifest.xml
index d1cf9f870..4dce26600 100644
--- a/samples/browseable/AsymmetricFingerprintDialog/AndroidManifest.xml
+++ b/samples/browseable/AsymmetricFingerprintDialog/AndroidManifest.xml
@@ -14,25 +14,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
-
+
+ android:name=".InjectedApplication"
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme"
+ tools:ignore="GoogleAppIndexingWarning">
-
+
-
-
+
+
diff --git a/samples/browseable/AsymmetricFingerprintDialog/res/layout/activity_main.xml b/samples/browseable/AsymmetricFingerprintDialog/res/layout/activity_main.xml
index 8f30557b9..16b29bd89 100644
--- a/samples/browseable/AsymmetricFingerprintDialog/res/layout/activity_main.xml
+++ b/samples/browseable/AsymmetricFingerprintDialog/res/layout/activity_main.xml
@@ -31,7 +31,8 @@
android:layout_marginBottom="32dp"
android:layout_gravity="center_horizontal"
android:scaleType="fitCenter"
- android:src="@drawable/android_robot"/>
+ android:src="@drawable/android_robot"
+ android:contentDescription="@string/description_bugdroid_icon" />
+ android:id="@+id/purchase_button"/>
+ android:src="@drawable/ic_fp_40px"
+ android:contentDescription="@string/description_fingerprint_icon"/>
diff --git a/samples/browseable/AsymmetricFingerprintDialog/res/values/strings.xml b/samples/browseable/AsymmetricFingerprintDialog/res/values/strings.xml
index f44c06d68..86b8d422d 100644
--- a/samples/browseable/AsymmetricFingerprintDialog/res/values/strings.xml
+++ b/samples/browseable/AsymmetricFingerprintDialog/res/values/strings.xml
@@ -19,7 +19,7 @@
CancelUse passwordSign in
- Ok
+ OKPasswordConfirm fingerprint to continueTouch sensor
@@ -36,4 +36,6 @@
Use fingerprint in the futureUse fingerprint to authenticateuse_fingerprint_to_authenticate_key
+ Android bugdroid image
+ Fingerprint icon
diff --git a/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintAuthenticationDialogFragment.java b/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintAuthenticationDialogFragment.java
index a56556f13..fbe8ec9c3 100644
--- a/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintAuthenticationDialogFragment.java
+++ b/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintAuthenticationDialogFragment.java
@@ -19,8 +19,8 @@ package com.example.android.asymmetricfingerprintdialog;
import com.example.android.asymmetricfingerprintdialog.server.StoreBackend;
import com.example.android.asymmetricfingerprintdialog.server.Transaction;
-import android.app.Activity;
import android.app.DialogFragment;
+import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
@@ -158,9 +158,9 @@ public class FingerprintAuthenticationDialogFragment extends DialogFragment
}
@Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
- mActivity = (MainActivity) activity;
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ mActivity = (MainActivity) getActivity();
}
/**
diff --git a/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintUiHelper.java b/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintUiHelper.java
index f65481161..dee427099 100644
--- a/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintUiHelper.java
+++ b/samples/browseable/AsymmetricFingerprintDialog/src/com.example.android.asymmetricfingerprintdialog/FingerprintUiHelper.java
@@ -27,7 +27,11 @@ import javax.inject.Inject;
/**
* Small helper class to manage text/icon around fingerprint authentication UI.
+ * This class assumes that the {@link android.Manifest.permission#USE_FINGERPRINT}
+ * permission has already been granted. (As of API 23 this permission is normal instead of dangerous
+ * and is granted at install time.)
*/
+@SuppressWarnings("MissingPermission")
public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallback {
@VisibleForTesting static final long ERROR_TIMEOUT_MILLIS = 1600;
diff --git a/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml b/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml
index 1c3b255fa..1f8a43198 100644
--- a/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml
+++ b/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml
@@ -26,7 +26,7 @@
-Schedule JobCancel all
- taskFinished
+ Finish last taskRequires device in idle mode.Charging:Requires device plugged in.Idle:
- ConstraintsConnectivity:AnyWiFiTiming:Delay:Deadline:
+ Work duration:
+ Cancelled job %d
+ No jobs to cancel
+ All jobs cancelled
diff --git a/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/MainActivity.java b/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/MainActivity.java
index 624e22d02..fbb817261 100644
--- a/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/MainActivity.java
+++ b/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/MainActivity.java
@@ -18,17 +18,19 @@ package com.example.android.jobscheduler;
import android.app.Activity;
import android.app.job.JobInfo;
-import android.app.job.JobParameters;
import android.app.job.JobScheduler;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.Messenger;
+import android.os.PersistableBundle;
+import android.support.annotation.ColorRes;
+import android.support.annotation.Nullable;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import android.widget.CheckBox;
import android.widget.EditText;
@@ -36,105 +38,97 @@ import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.Toast;
-import com.example.android.jobscheduler.service.TestJobService;
+import com.example.android.jobscheduler.service.MyJobService;
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+
+/**
+ * Schedules and configures jobs to be executed by a {@link JobScheduler}.
+ *
+ * {@link MyJobService} can send messages to this via a {@link Messenger}
+ * that is sent in the Intent that starts the Service.
+ */
public class MainActivity extends Activity {
- private static final String TAG = "MainActivity";
+ private static final String TAG = MainActivity.class.getSimpleName();
- public static final int MSG_UNCOLOUR_START = 0;
- public static final int MSG_UNCOLOUR_STOP = 1;
- public static final int MSG_SERVICE_OBJ = 2;
+ public static final int MSG_UNCOLOR_START = 0;
+ public static final int MSG_UNCOLOR_STOP = 1;
+ public static final int MSG_COLOR_START = 2;
+ public static final int MSG_COLOR_STOP = 3;
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.sample_main);
- Resources res = getResources();
- defaultColor = res.getColor(R.color.none_received);
- startJobColor = res.getColor(R.color.start_received);
- stopJobColor = res.getColor(R.color.stop_received);
+ public static final String MESSENGER_INTENT_KEY
+ = BuildConfig.APPLICATION_ID + ".MESSENGER_INTENT_KEY";
+ public static final String WORK_DURATION_KEY =
+ BuildConfig.APPLICATION_ID + ".WORK_DURATION_KEY";
- // Set up UI.
- mShowStartView = (TextView) findViewById(R.id.onstart_textview);
- mShowStopView = (TextView) findViewById(R.id.onstop_textview);
- mParamsTextView = (TextView) findViewById(R.id.task_params);
- mDelayEditText = (EditText) findViewById(R.id.delay_time);
- mDeadlineEditText = (EditText) findViewById(R.id.deadline_time);
- mWiFiConnectivityRadioButton = (RadioButton) findViewById(R.id.checkbox_unmetered);
- mAnyConnectivityRadioButton = (RadioButton) findViewById(R.id.checkbox_any);
- mRequiresChargingCheckBox = (CheckBox) findViewById(R.id.checkbox_charging);
- mRequiresIdleCheckbox = (CheckBox) findViewById(R.id.checkbox_idle);
- mServiceComponent = new ComponentName(this, TestJobService.class);
- // Start service and provide it a way to communicate with us.
- Intent startServiceIntent = new Intent(this, TestJobService.class);
- startServiceIntent.putExtra("messenger", new Messenger(mHandler));
- startService(startServiceIntent);
- }
- // UI fields.
- int defaultColor;
- int startJobColor;
- int stopJobColor;
-
- private TextView mShowStartView;
- private TextView mShowStopView;
- private TextView mParamsTextView;
private EditText mDelayEditText;
private EditText mDeadlineEditText;
+ private EditText mDurationTimeEditText;
private RadioButton mWiFiConnectivityRadioButton;
private RadioButton mAnyConnectivityRadioButton;
private CheckBox mRequiresChargingCheckBox;
private CheckBox mRequiresIdleCheckbox;
- ComponentName mServiceComponent;
- /** Service object to interact scheduled jobs. */
- TestJobService mTestService;
+ private ComponentName mServiceComponent;
- private static int kJobId = 0;
+ private int mJobId = 0;
- Handler mHandler = new Handler(/* default looper */) {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_UNCOLOUR_START:
- mShowStartView.setBackgroundColor(defaultColor);
- break;
- case MSG_UNCOLOUR_STOP:
- mShowStopView.setBackgroundColor(defaultColor);
- break;
- case MSG_SERVICE_OBJ:
- mTestService = (TestJobService) msg.obj;
- mTestService.setUiCallback(MainActivity.this);
- }
- }
- };
+ // Handler for incoming messages from the service.
+ private IncomingMessageHandler mHandler;
- private boolean ensureTestService() {
- if (mTestService == null) {
- Toast.makeText(MainActivity.this, "Service null, never got callback?",
- Toast.LENGTH_SHORT).show();
- return false;
- }
- return true;
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.sample_main);
+
+ // Set up UI.
+ mDelayEditText = (EditText) findViewById(R.id.delay_time);
+ mDurationTimeEditText = (EditText) findViewById(R.id.duration_time);
+ mDeadlineEditText = (EditText) findViewById(R.id.deadline_time);
+ mWiFiConnectivityRadioButton = (RadioButton) findViewById(R.id.checkbox_unmetered);
+ mAnyConnectivityRadioButton = (RadioButton) findViewById(R.id.checkbox_any);
+ mRequiresChargingCheckBox = (CheckBox) findViewById(R.id.checkbox_charging);
+ mRequiresIdleCheckbox = (CheckBox) findViewById(R.id.checkbox_idle);
+ mServiceComponent = new ComponentName(this, MyJobService.class);
+
+ mHandler = new IncomingMessageHandler(this);
+ }
+
+ @Override
+ protected void onStop() {
+ // A service can be "started" and/or "bound". In this case, it's "started" by this Activity
+ // and "bound" to the JobScheduler (also called "Scheduled" by the JobScheduler). This call
+ // to stopService() won't prevent scheduled jobs to be processed. However, failing
+ // to call stopService() would keep it alive indefinitely.
+ stopService(new Intent(this, MyJobService.class));
+ super.onStop();
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ // Start service and provide it a way to communicate with this class.
+ Intent startServiceIntent = new Intent(this, MyJobService.class);
+ Messenger messengerIncoming = new Messenger(mHandler);
+ startServiceIntent.putExtra(MESSENGER_INTENT_KEY, messengerIncoming);
+ startService(startServiceIntent);
}
/**
- * UI onclick listener to schedule a job. What this job is is defined in
- * TestJobService#scheduleJob().
+ * Executed when user clicks on SCHEDULE JOB.
*/
public void scheduleJob(View v) {
- if (!ensureTestService()) {
- return;
- }
-
- JobInfo.Builder builder = new JobInfo.Builder(kJobId++, mServiceComponent);
+ JobInfo.Builder builder = new JobInfo.Builder(mJobId++, mServiceComponent);
String delay = mDelayEditText.getText().toString();
- if (delay != null && !TextUtils.isEmpty(delay)) {
+ if (!TextUtils.isEmpty(delay)) {
builder.setMinimumLatency(Long.valueOf(delay) * 1000);
}
String deadline = mDeadlineEditText.getText().toString();
- if (deadline != null && !TextUtils.isEmpty(deadline)) {
+ if (!TextUtils.isEmpty(deadline)) {
builder.setOverrideDeadline(Long.valueOf(deadline) * 1000);
}
boolean requiresUnmetered = mWiFiConnectivityRadioButton.isChecked();
@@ -147,49 +141,128 @@ public class MainActivity extends Activity {
builder.setRequiresDeviceIdle(mRequiresIdleCheckbox.isChecked());
builder.setRequiresCharging(mRequiresChargingCheckBox.isChecked());
- mTestService.scheduleJob(builder.build());
+ // Extras, work duration.
+ PersistableBundle extras = new PersistableBundle();
+ String workDuration = mDurationTimeEditText.getText().toString();
+ if (TextUtils.isEmpty(workDuration)) {
+ workDuration = "1";
+ }
+ extras.putLong(WORK_DURATION_KEY, Long.valueOf(workDuration) * 1000);
- }
+ builder.setExtras(extras);
- public void cancelAllJobs(View v) {
- JobScheduler tm =
- (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
- tm.cancelAll();
+ // Schedule job
+ Log.d(TAG, "Scheduling job");
+ JobScheduler tm = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
+ tm.schedule(builder.build());
}
/**
- * UI onclick listener to call jobFinished() in our service.
+ * Executed when user clicks on CANCEL ALL.
+ */
+ public void cancelAllJobs(View v) {
+ JobScheduler tm = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
+ tm.cancelAll();
+ Toast.makeText(MainActivity.this, R.string.all_jobs_cancelled, Toast.LENGTH_SHORT).show();
+ }
+
+ /**
+ * Executed when user clicks on FINISH LAST TASK.
*/
public void finishJob(View v) {
- if (!ensureTestService()) {
- return;
+ JobScheduler jobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
+ List allPendingJobs = jobScheduler.getAllPendingJobs();
+ if (allPendingJobs.size() > 0) {
+ // Finish the last one
+ int jobId = allPendingJobs.get(0).getId();
+ jobScheduler.cancel(jobId);
+ Toast.makeText(
+ MainActivity.this, String.format(getString(R.string.cancelled_job), jobId),
+ Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(
+ MainActivity.this, getString(R.string.no_jobs_to_cancel),
+ Toast.LENGTH_SHORT).show();
}
- mTestService.callJobFinished();
- mParamsTextView.setText("");
}
/**
- * Receives callback from the service when a job has landed
- * on the app. Colours the UI and post a message to
- * uncolour it after a second.
+ * A {@link Handler} allows you to send messages associated with a thread. A {@link Messenger}
+ * uses this handler to communicate from {@link MyJobService}. It's also used to make
+ * the start and stop views blink for a short period of time.
*/
- public void onReceivedStartJob(JobParameters params) {
- mShowStartView.setBackgroundColor(startJobColor);
- Message m = Message.obtain(mHandler, MSG_UNCOLOUR_START);
- mHandler.sendMessageDelayed(m, 1000L); // uncolour in 1 second.
- mParamsTextView.setText("Executing: " + params.getJobId() + " " + params.getExtras());
- }
+ private static class IncomingMessageHandler extends Handler {
- /**
- * Receives callback from the service when a job that
- * previously landed on the app must stop executing.
- * Colours the UI and post a message to uncolour it after a
- * second.
- */
- public void onReceivedStopJob() {
- mShowStopView.setBackgroundColor(stopJobColor);
- Message m = Message.obtain(mHandler, MSG_UNCOLOUR_STOP);
- mHandler.sendMessageDelayed(m, 2000L); // uncolour in 1 second.
- mParamsTextView.setText("");
+ // Prevent possible leaks with a weak reference.
+ private WeakReference mActivity;
+
+ IncomingMessageHandler(MainActivity activity) {
+ super(/* default looper */);
+ this.mActivity = new WeakReference<>(activity);
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ MainActivity mainActivity = mActivity.get();
+ if (mainActivity == null) {
+ // Activity is no longer available, exit.
+ return;
+ }
+ View showStartView = mainActivity.findViewById(R.id.onstart_textview);
+ View showStopView = mainActivity.findViewById(R.id.onstop_textview);
+ Message m;
+ switch (msg.what) {
+ /*
+ * Receives callback from the service when a job has landed
+ * on the app. Turns on indicator and sends a message to turn it off after
+ * a second.
+ */
+ case MSG_COLOR_START:
+ // Start received, turn on the indicator and show text.
+ showStartView.setBackgroundColor(getColor(R.color.start_received));
+ updateParamsTextView(msg.obj, "started");
+
+ // Send message to turn it off after a second.
+ m = Message.obtain(this, MSG_UNCOLOR_START);
+ sendMessageDelayed(m, 1000L);
+ break;
+ /*
+ * Receives callback from the service when a job that previously landed on the
+ * app must stop executing. Turns on indicator and sends a message to turn it
+ * off after two seconds.
+ */
+ case MSG_COLOR_STOP:
+ // Stop received, turn on the indicator and show text.
+ showStopView.setBackgroundColor(getColor(R.color.stop_received));
+ updateParamsTextView(msg.obj, "stopped");
+
+ // Send message to turn it off after a second.
+ m = obtainMessage(MSG_UNCOLOR_STOP);
+ sendMessageDelayed(m, 2000L);
+ break;
+ case MSG_UNCOLOR_START:
+ showStartView.setBackgroundColor(getColor(R.color.none_received));
+ updateParamsTextView(null, "");
+ break;
+ case MSG_UNCOLOR_STOP:
+ showStopView.setBackgroundColor(getColor(R.color.none_received));
+ updateParamsTextView(null, "");
+ break;
+ }
+ }
+
+ private void updateParamsTextView(@Nullable Object jobId, String action) {
+ TextView paramsTextView = (TextView) mActivity.get().findViewById(R.id.task_params);
+ if (jobId == null) {
+ paramsTextView.setText("");
+ return;
+ }
+ String jobIdText = String.valueOf(jobId);
+ paramsTextView.setText(String.format("Job ID %s %s", jobIdText, action));
+ }
+
+ private int getColor(@ColorRes int color) {
+ return mActivity.get().getResources().getColor(color);
+ }
}
}
diff --git a/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/service/MyJobService.java b/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/service/MyJobService.java
new file mode 100644
index 000000000..2f521bb0d
--- /dev/null
+++ b/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/service/MyJobService.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.jobscheduler.service;
+
+import android.app.job.JobParameters;
+import android.app.job.JobService;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+
+import static com.example.android.jobscheduler.MainActivity.MESSENGER_INTENT_KEY;
+import static com.example.android.jobscheduler.MainActivity.MSG_COLOR_START;
+import static com.example.android.jobscheduler.MainActivity.MSG_COLOR_STOP;
+import static com.example.android.jobscheduler.MainActivity.WORK_DURATION_KEY;
+
+
+/**
+ * Service to handle callbacks from the JobScheduler. Requests scheduled with the JobScheduler
+ * ultimately land on this service's "onStartJob" method. It runs jobs for a specific amount of time
+ * and finishes them. It keeps the activity updated with changes via a Messenger.
+ */
+public class MyJobService extends JobService {
+
+ private static final String TAG = MyJobService.class.getSimpleName();
+
+ private Messenger mActivityMessenger;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ Log.i(TAG, "Service created");
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ Log.i(TAG, "Service destroyed");
+ }
+
+ /**
+ * When the app's MainActivity is created, it starts this service. This is so that the
+ * activity and this service can communicate back and forth. See "setUiCallback()"
+ */
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ mActivityMessenger = intent.getParcelableExtra(MESSENGER_INTENT_KEY);
+ return START_NOT_STICKY;
+ }
+
+ @Override
+ public boolean onStartJob(final JobParameters params) {
+ // The work that this service "does" is simply wait for a certain duration and finish
+ // the job (on another thread).
+
+ sendMessage(MSG_COLOR_START, params.getJobId());
+
+ long duration = params.getExtras().getLong(WORK_DURATION_KEY);
+
+ // Uses a handler to delay the execution of jobFinished().
+ Handler handler = new Handler();
+ handler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ sendMessage(MSG_COLOR_STOP, params.getJobId());
+ jobFinished(params, false);
+ }
+ }, duration);
+ Log.i(TAG, "on start job: " + params.getJobId());
+
+ // Return true as there's more work to be done with this job.
+ return true;
+ }
+
+ @Override
+ public boolean onStopJob(JobParameters params) {
+ // Stop tracking these job parameters, as we've 'finished' executing.
+ sendMessage(MSG_COLOR_STOP, params.getJobId());
+ Log.i(TAG, "on stop job: " + params.getJobId());
+
+ // Return false to drop the job.
+ return false;
+ }
+
+ private void sendMessage(int messageID, @Nullable Object params) {
+ // If this service is launched by the JobScheduler, there's no callback Messenger. It
+ // only exists when the MainActivity calls startService() with the callback in the Intent.
+ if (mActivityMessenger == null) {
+ Log.d(TAG, "Service is bound, not started. There's no callback to send a message to.");
+ return;
+ }
+ Message m = Message.obtain();
+ m.what = messageID;
+ m.obj = params;
+ try {
+ mActivityMessenger.send(m);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error passing service object back to activity.");
+ }
+ }
+}
diff --git a/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/service/TestJobService.java b/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/service/TestJobService.java
deleted file mode 100644
index 8608be570..000000000
--- a/samples/browseable/JobScheduler/src/com.example.android.jobscheduler/service/TestJobService.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.jobscheduler.service;
-
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.app.job.JobParameters;
-import android.app.job.JobService;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Message;
-import android.os.Messenger;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.example.android.jobscheduler.MainActivity;
-
-import java.util.LinkedList;
-
-
-/**
- * Service to handle callbacks from the JobScheduler. Requests scheduled with the JobScheduler
- * ultimately land on this service's "onStartJob" method. Currently all this does is post a message
- * to the app's main activity to change the state of the UI.
- */
-public class TestJobService extends JobService {
- private static final String TAG = "SyncService";
-
- @Override
- public void onCreate() {
- super.onCreate();
- Log.i(TAG, "Service created");
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- Log.i(TAG, "Service destroyed");
- }
-
- /**
- * When the app's MainActivity is created, it starts this service. This is so that the
- * activity and this service can communicate back and forth. See "setUiCalback()"
- */
- @Override
- public int onStartCommand(Intent intent, int flags, int startId) {
- Messenger callback = intent.getParcelableExtra("messenger");
- Message m = Message.obtain();
- m.what = MainActivity.MSG_SERVICE_OBJ;
- m.obj = this;
- try {
- callback.send(m);
- } catch (RemoteException e) {
- Log.e(TAG, "Error passing service object back to activity.");
- }
- return START_NOT_STICKY;
- }
-
- @Override
- public boolean onStartJob(JobParameters params) {
- // We don't do any real 'work' in this sample app. All we'll
- // do is track which jobs have landed on our service, and
- // update the UI accordingly.
- jobParamsMap.add(params);
- if (mActivity != null) {
- mActivity.onReceivedStartJob(params);
- }
- Log.i(TAG, "on start job: " + params.getJobId());
- return true;
- }
-
- @Override
- public boolean onStopJob(JobParameters params) {
- // Stop tracking these job parameters, as we've 'finished' executing.
- jobParamsMap.remove(params);
- if (mActivity != null) {
- mActivity.onReceivedStopJob();
- }
- Log.i(TAG, "on stop job: " + params.getJobId());
- return true;
- }
-
- MainActivity mActivity;
- private final LinkedList jobParamsMap = new LinkedList();
-
- public void setUiCallback(MainActivity activity) {
- mActivity = activity;
- }
-
- /** Send job to the JobScheduler. */
- public void scheduleJob(JobInfo t) {
- Log.d(TAG, "Scheduling job");
- JobScheduler tm =
- (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
- tm.schedule(t);
- }
-
- /**
- * Not currently used, but as an exercise you can hook this
- * up to a button in the UI to finish a job that has landed
- * in onStartJob().
- */
- public boolean callJobFinished() {
- JobParameters params = jobParamsMap.poll();
- if (params == null) {
- return false;
- } else {
- jobFinished(params, false);
- return true;
- }
- }
-
-}
diff --git a/samples/browseable/JumpingJack/AndroidManifest.xml b/samples/browseable/JumpingJack/AndroidManifest.xml
index f6cf22047..0e0475a27 100644
--- a/samples/browseable/JumpingJack/AndroidManifest.xml
+++ b/samples/browseable/JumpingJack/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.jumpingjack">
+ android:targetSdkVersion="25" />
@@ -29,6 +29,11 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault.Light">
+
+
+
diff --git a/samples/browseable/LNotifications/res/layout/activity_notification.xml b/samples/browseable/LNotifications/res/layout/activity_notification.xml
index cd0cd6878..8723923fd 100644
--- a/samples/browseable/LNotifications/res/layout/activity_notification.xml
+++ b/samples/browseable/LNotifications/res/layout/activity_notification.xml
@@ -14,14 +14,26 @@
limitations under the License.
-->
-
-
+
+
+
+
+
+
diff --git a/samples/browseable/LNotifications/src/com.example.android.lnotifications/HeadsUpNotificationFragment.java b/samples/browseable/LNotifications/src/com.example.android.lnotifications/HeadsUpNotificationFragment.java
index d304cf4ae..89904031a 100644
--- a/samples/browseable/LNotifications/src/com.example.android.lnotifications/HeadsUpNotificationFragment.java
+++ b/samples/browseable/LNotifications/src/com.example.android.lnotifications/HeadsUpNotificationFragment.java
@@ -16,13 +16,13 @@
package com.example.android.lnotifications;
-import android.app.Fragment;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -110,8 +110,7 @@ public class HeadsUpNotificationFragment extends Fragment {
*
* @return A Notification instance.
*/
- //@VisibleForTesting
- Notification createNotification(boolean makeHeadsUpNotification) {
+ private Notification createNotification(boolean makeHeadsUpNotification) {
Notification.Builder notificationBuilder = new Notification.Builder(getActivity())
.setSmallIcon(R.drawable.ic_launcher_notification)
.setPriority(Notification.PRIORITY_DEFAULT)
diff --git a/samples/browseable/LNotifications/src/com.example.android.lnotifications/LNotificationActivity.java b/samples/browseable/LNotifications/src/com.example.android.lnotifications/LNotificationActivity.java
index fbc3e6232..8b44ed327 100644
--- a/samples/browseable/LNotifications/src/com.example.android.lnotifications/LNotificationActivity.java
+++ b/samples/browseable/LNotifications/src/com.example.android.lnotifications/LNotificationActivity.java
@@ -16,65 +16,74 @@
package com.example.android.lnotifications;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+
+import static com.example.android.lnotifications.R.id.pager;
/**
* Launcher Activity for the L Notification samples application.
*/
-public class LNotificationActivity extends Activity {
+public class LNotificationActivity extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_notification);
- setTitle(R.string.title_lnotification_activity);
- ActionBar actionBar = getActionBar();
- // Use ViewPager in the support library where possible.
- // At this time, the support library for L is not ready so using the deprecated method
- // to create tabs.
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
- ActionBar.Tab tabHeadsUpNotification = actionBar.newTab().setText("Heads Up");
- ActionBar.Tab tabVisibilityMetadata = actionBar.newTab().setText("Visibility");
- ActionBar.Tab tabOtherMetadata = actionBar.newTab().setText("Others");
- tabHeadsUpNotification.setTabListener(new FragmentTabListener(HeadsUpNotificationFragment
- .newInstance()));
- tabVisibilityMetadata.setTabListener(new FragmentTabListener(VisibilityMetadataFragment
- .newInstance()));
- tabOtherMetadata.setTabListener(new FragmentTabListener(OtherMetadataFragment.newInstance
- ()));
- actionBar.addTab(tabHeadsUpNotification, 0);
- actionBar.addTab(tabVisibilityMetadata, 1);
- actionBar.addTab(tabOtherMetadata, 2);
+ // Show 3 tabs with the different notification options.
+ ViewPager viewPager = (ViewPager) findViewById(pager);
+ TabLayout tabs = (TabLayout) findViewById(R.id.tabs);
+
+ NotificationsPagerAdapter pagerAdapter =
+ new NotificationsPagerAdapter(getSupportFragmentManager());
+ viewPager.setAdapter(pagerAdapter);
+ tabs.setupWithViewPager(viewPager);
}
- /**
- * TabListener that replaces a Fragment when a tab is clicked.
- */
- private static class FragmentTabListener implements ActionBar.TabListener {
- public Fragment fragment;
+ private static class NotificationsPagerAdapter extends FragmentPagerAdapter {
- public FragmentTabListener(Fragment fragment) {
- this.fragment = fragment;
+ NotificationsPagerAdapter(FragmentManager fm) {
+ super(fm);
}
@Override
- public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
- //do nothing.
+ public Fragment getItem(int position) {
+ switch (position) {
+ case 0:
+ return HeadsUpNotificationFragment.newInstance();
+ case 1:
+ return VisibilityMetadataFragment.newInstance();
+ case 2:
+ return OtherMetadataFragment.newInstance();
+ default:
+ break;
+ }
+ return null;
}
@Override
- public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
- ft.replace(R.id.container, fragment);
+ public int getCount() {
+ return 3;
}
@Override
- public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
- ft.remove(fragment);
+ public CharSequence getPageTitle(int position) {
+ switch (position) {
+ case 0:
+ return "Heads Up";
+ case 1:
+ return "Visibility";
+ case 2:
+ return "Others";
+ default:
+ return super.getPageTitle(position);
+ }
}
}
}
diff --git a/samples/browseable/LNotifications/src/com.example.android.lnotifications/OtherMetadataFragment.java b/samples/browseable/LNotifications/src/com.example.android.lnotifications/OtherMetadataFragment.java
index 51616e700..0da2c2ade 100644
--- a/samples/browseable/LNotifications/src/com.example.android.lnotifications/OtherMetadataFragment.java
+++ b/samples/browseable/LNotifications/src/com.example.android.lnotifications/OtherMetadataFragment.java
@@ -17,7 +17,6 @@
package com.example.android.lnotifications;
import android.app.Activity;
-import android.app.Fragment;
import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
@@ -30,6 +29,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.provider.ContactsContract;
import android.provider.MediaStore;
+import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -42,7 +42,6 @@ import android.widget.TextView;
import android.widget.Toast;
import java.io.IOException;
-import java.util.Random;
/**
* Fragment that demonstrates how to attach metadata introduced in Android L, such as
@@ -58,10 +57,10 @@ public class OtherMetadataFragment extends Fragment {
public static final int REQUEST_CODE_PICK_CONTACT = 1;
/**
- * Incremental Integer used for ID for notifications so that each notification will be
+ * Incremental int used for ID for notifications so that each notification will be
* treated differently.
*/
- private Integer mIncrementalNotificationId = Integer.valueOf(0);
+ private int mIncrementalNotificationId = 0;
private NotificationManager mNotificationManager;
@@ -85,8 +84,7 @@ public class OtherMetadataFragment extends Fragment {
/**
* Holds a URI for the person to be attached to the notification.
*/
- //@VisibleForTesting
- Uri mContactUri;
+ private Uri mContactUri;
/**
* Use this factory method to create a new instance of
@@ -177,8 +175,7 @@ public class OtherMetadataFragment extends Fragment {
*
* @return A Notification instance.
*/
- //@VisibleForTesting
- Notification createNotification(Priority priority, Category category, Uri contactUri) {
+ private Notification createNotification(Priority priority, Category category, Uri contactUri) {
Notification.Builder notificationBuilder = new Notification.Builder(getActivity())
.setContentTitle("Notification with other metadata")
.setSmallIcon(R.drawable.ic_launcher_notification)
@@ -207,7 +204,7 @@ public class OtherMetadataFragment extends Fragment {
private void showNotificationClicked(Priority priority, Category category, Uri contactUri) {
// Assigns a unique (incremented) notification ID in order to treat each notification as a
// different one. This helps demonstrate how a priority flag affects ordering.
- mIncrementalNotificationId = new Integer(mIncrementalNotificationId + 1);
+ mIncrementalNotificationId++;
mNotificationManager.notify(mIncrementalNotificationId, createNotification(priority,
category, contactUri));
Toast.makeText(getActivity(), "Show Notification clicked", Toast.LENGTH_SHORT).show();
@@ -295,8 +292,7 @@ public class OtherMetadataFragment extends Fragment {
* Enum indicating possible categories in {@link Notification} used from
* {@link #mCategorySpinner}.
*/
- //@VisibleForTesting
- static enum Category {
+ private enum Category {
ALARM("alarm"),
CALL("call"),
EMAIL("email"),
@@ -328,8 +324,7 @@ public class OtherMetadataFragment extends Fragment {
* Enum indicating possible priorities in {@link Notification} used from
* {@link #mPrioritySpinner}.
*/
- //@VisibleForTesting
- static enum Priority {
+ private enum Priority {
DEFAULT(Notification.PRIORITY_DEFAULT),
MAX(Notification.PRIORITY_MAX),
HIGH(Notification.PRIORITY_HIGH),
diff --git a/samples/browseable/LNotifications/src/com.example.android.lnotifications/VisibilityMetadataFragment.java b/samples/browseable/LNotifications/src/com.example.android.lnotifications/VisibilityMetadataFragment.java
index 616632b34..c12d1082e 100644
--- a/samples/browseable/LNotifications/src/com.example.android.lnotifications/VisibilityMetadataFragment.java
+++ b/samples/browseable/LNotifications/src/com.example.android.lnotifications/VisibilityMetadataFragment.java
@@ -16,11 +16,11 @@
package com.example.android.lnotifications;
-import android.app.Fragment;
import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
import android.os.Bundle;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -28,8 +28,6 @@ import android.widget.Button;
import android.widget.RadioGroup;
import android.widget.Toast;
-import java.util.Random;
-
/**
* Fragment that demonstrates how notifications with different visibility metadata differ on
@@ -45,10 +43,10 @@ public class VisibilityMetadataFragment extends Fragment {
private RadioGroup mRadioGroup;
/**
- * Incremental Integer used for ID for notifications so that each notification will be
+ * Incremental int used for ID for notifications so that each notification will be
* treated differently.
*/
- private Integer mIncrementalNotificationId = Integer.valueOf(0);
+ private int mIncrementalNotificationId = 0;
/**
* Button to show a notification.
@@ -106,8 +104,7 @@ public class VisibilityMetadataFragment extends Fragment {
*
* @return A Notification instance.
*/
- //@VisibleForTesting
- Notification createNotification(NotificationVisibility visibility) {
+ private Notification createNotification(NotificationVisibility visibility) {
Notification.Builder notificationBuilder = new Notification.Builder(getActivity())
.setContentTitle("Notification for Visibility metadata");
@@ -150,7 +147,7 @@ public class VisibilityMetadataFragment extends Fragment {
// Assigns a unique (incremented) notification ID in order to treat each notification as a
// different one. This helps demonstrate how a notification with a different visibility
// level differs on the lockscreen.
- mIncrementalNotificationId = new Integer(mIncrementalNotificationId + 1);
+ mIncrementalNotificationId++;
mNotificationManager.notify(mIncrementalNotificationId, createNotification(visibility));
Toast.makeText(getActivity(), "Show Notification clicked", Toast.LENGTH_SHORT).show();
}
@@ -160,8 +157,7 @@ public class VisibilityMetadataFragment extends Fragment {
* representation of visibility levels, an icon ID to create a notification) to
* create a notification.
*/
- //@VisibleForTesting
- static enum NotificationVisibility {
+ private enum NotificationVisibility {
PUBLIC(Notification.VISIBILITY_PUBLIC, "Public", R.drawable.ic_public_notification),
PRIVATE(Notification.VISIBILITY_PRIVATE, "Private", R.drawable.ic_private_notification),
SECRET(Notification.VISIBILITY_SECRET, "Secret", R.drawable.ic_secret_notification);
diff --git a/samples/browseable/NetworkConnect/AndroidManifest.xml b/samples/browseable/NetworkConnect/AndroidManifest.xml
index 00ce7f3d0..654203b61 100644
--- a/samples/browseable/NetworkConnect/AndroidManifest.xml
+++ b/samples/browseable/NetworkConnect/AndroidManifest.xml
@@ -31,8 +31,8 @@
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:theme="@style/Theme.Sample"
- android:allowBackup="true">
-
+ android:allowBackup="true"
+ android:networkSecurityConfig="@xml/network_security_config">
This sample demonstrates how to connect to the network and fetch raw HTML using
- HttpURLConnection. AsyncTask is used to perform the fetch on a background thread.
+ HttpsURLConnection. AsyncTask is used to perform the fetch on a background thread.
diff --git a/samples/browseable/NetworkConnect/res/layout/sample_main.xml b/samples/browseable/NetworkConnect/res/layout/sample_main.xml
index 76fa7d783..00e219c5b 100755
--- a/samples/browseable/NetworkConnect/res/layout/sample_main.xml
+++ b/samples/browseable/NetworkConnect/res/layout/sample_main.xml
@@ -21,20 +21,22 @@
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
-
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:text="@string/welcome_message"
+ android:freezesText="true"/>
-
+ android:layout_height="match_parent"
+ android:freezesText="true"/>
diff --git a/samples/browseable/NetworkConnect/res/values/base-strings.xml b/samples/browseable/NetworkConnect/res/values/base-strings.xml
index ae4485e0e..820b92125 100644
--- a/samples/browseable/NetworkConnect/res/values/base-strings.xml
+++ b/samples/browseable/NetworkConnect/res/values/base-strings.xml
@@ -22,7 +22,7 @@
This sample demonstrates how to connect to the network and fetch raw HTML using
- HttpURLConnection. AsyncTask is used to perform the fetch on a background thread.
+ HttpsURLConnection. AsyncTask is used to perform the fetch on a background thread.
]]>
diff --git a/samples/browseable/NetworkConnect/res/values/strings.xml b/samples/browseable/NetworkConnect/res/values/strings.xml
index 1e7915afe..d2be145a8 100755
--- a/samples/browseable/NetworkConnect/res/values/strings.xml
+++ b/samples/browseable/NetworkConnect/res/values/strings.xml
@@ -18,8 +18,8 @@
Welcome to Network Connect!
Click FETCH to fetch the first 500 characters of raw HTML from www.google.com.
-
FetchClearConnection error.
+ Fetch cancelled.
diff --git a/samples/browseable/NetworkConnect/res/xml/network_security_config.xml b/samples/browseable/NetworkConnect/res/xml/network_security_config.xml
new file mode 100644
index 000000000..4631b891f
--- /dev/null
+++ b/samples/browseable/NetworkConnect/res/xml/network_security_config.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/Log.java b/samples/browseable/NetworkConnect/src/com.example.android.common.logger/Log.java
deleted file mode 100644
index 17503c568..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/Log.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.android.common.logger;
-
-/**
- * Helper class for a list (or tree) of LoggerNodes.
- *
- *
When this is set as the head of the list,
- * an instance of it can function as a drop-in replacement for {@link android.util.Log}.
- * Most of the methods in this class server only to map a method call in Log to its equivalent
- * in LogNode.
- */
-public class Log {
- // Grabbing the native values from Android's native logging facilities,
- // to make for easy migration and interop.
- public static final int NONE = -1;
- public static final int VERBOSE = android.util.Log.VERBOSE;
- public static final int DEBUG = android.util.Log.DEBUG;
- public static final int INFO = android.util.Log.INFO;
- public static final int WARN = android.util.Log.WARN;
- public static final int ERROR = android.util.Log.ERROR;
- public static final int ASSERT = android.util.Log.ASSERT;
-
- // Stores the beginning of the LogNode topology.
- private static LogNode mLogNode;
-
- /**
- * Returns the next LogNode in the linked list.
- */
- public static LogNode getLogNode() {
- return mLogNode;
- }
-
- /**
- * Sets the LogNode data will be sent to.
- */
- public static void setLogNode(LogNode node) {
- mLogNode = node;
- }
-
- /**
- * Instructs the LogNode to print the log data provided. Other LogNodes can
- * be chained to the end of the LogNode as desired.
- *
- * @param priority Log level of the data being logged. Verbose, Error, etc.
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void println(int priority, String tag, String msg, Throwable tr) {
- if (mLogNode != null) {
- mLogNode.println(priority, tag, msg, tr);
- }
- }
-
- /**
- * Instructs the LogNode to print the log data provided. Other LogNodes can
- * be chained to the end of the LogNode as desired.
- *
- * @param priority Log level of the data being logged. Verbose, Error, etc.
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged. The actual message to be logged.
- */
- public static void println(int priority, String tag, String msg) {
- println(priority, tag, msg, null);
- }
-
- /**
- * Prints a message at VERBOSE priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void v(String tag, String msg, Throwable tr) {
- println(VERBOSE, tag, msg, tr);
- }
-
- /**
- * Prints a message at VERBOSE priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- */
- public static void v(String tag, String msg) {
- v(tag, msg, null);
- }
-
-
- /**
- * Prints a message at DEBUG priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void d(String tag, String msg, Throwable tr) {
- println(DEBUG, tag, msg, tr);
- }
-
- /**
- * Prints a message at DEBUG priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- */
- public static void d(String tag, String msg) {
- d(tag, msg, null);
- }
-
- /**
- * Prints a message at INFO priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void i(String tag, String msg, Throwable tr) {
- println(INFO, tag, msg, tr);
- }
-
- /**
- * Prints a message at INFO priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- */
- public static void i(String tag, String msg) {
- i(tag, msg, null);
- }
-
- /**
- * Prints a message at WARN priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void w(String tag, String msg, Throwable tr) {
- println(WARN, tag, msg, tr);
- }
-
- /**
- * Prints a message at WARN priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- */
- public static void w(String tag, String msg) {
- w(tag, msg, null);
- }
-
- /**
- * Prints a message at WARN priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void w(String tag, Throwable tr) {
- w(tag, null, tr);
- }
-
- /**
- * Prints a message at ERROR priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void e(String tag, String msg, Throwable tr) {
- println(ERROR, tag, msg, tr);
- }
-
- /**
- * Prints a message at ERROR priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- */
- public static void e(String tag, String msg) {
- e(tag, msg, null);
- }
-
- /**
- * Prints a message at ASSERT priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void wtf(String tag, String msg, Throwable tr) {
- println(ASSERT, tag, msg, tr);
- }
-
- /**
- * Prints a message at ASSERT priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged.
- */
- public static void wtf(String tag, String msg) {
- wtf(tag, msg, null);
- }
-
- /**
- * Prints a message at ASSERT priority.
- *
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public static void wtf(String tag, Throwable tr) {
- wtf(tag, null, tr);
- }
-}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogFragment.java b/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogFragment.java
deleted file mode 100644
index b302acd4b..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogFragment.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* Copyright 2013 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.common.logger;
-
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ScrollView;
-
-/**
- * Simple fraggment which contains a LogView and uses is to output log data it receives
- * through the LogNode interface.
- */
-public class LogFragment extends Fragment {
-
- private LogView mLogView;
- private ScrollView mScrollView;
-
- public LogFragment() {}
-
- public View inflateViews() {
- mScrollView = new ScrollView(getActivity());
- ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.MATCH_PARENT);
- mScrollView.setLayoutParams(scrollParams);
-
- mLogView = new LogView(getActivity());
- ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams);
- logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;
- mLogView.setLayoutParams(logParams);
- mLogView.setClickable(true);
- mLogView.setFocusable(true);
- mLogView.setTypeface(Typeface.MONOSPACE);
-
- // Want to set padding as 16 dips, setPadding takes pixels. Hooray math!
- int paddingDips = 16;
- double scale = getResources().getDisplayMetrics().density;
- int paddingPixels = (int) ((paddingDips * (scale)) + .5);
- mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels);
- mLogView.setCompoundDrawablePadding(paddingPixels);
-
- mLogView.setGravity(Gravity.BOTTOM);
- mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium);
-
- mScrollView.addView(mLogView);
- return mScrollView;
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
-
- View result = inflateViews();
-
- mLogView.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
- @Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {}
-
- @Override
- public void afterTextChanged(Editable s) {
- mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
- }
- });
- return result;
- }
-
- public LogView getLogView() {
- return mLogView;
- }
-}
\ No newline at end of file
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogNode.java b/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogNode.java
deleted file mode 100644
index bc37cabc0..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.android.common.logger;
-
-/**
- * Basic interface for a logging system that can output to one or more targets.
- * Note that in addition to classes that will output these logs in some format,
- * one can also implement this interface over a filter and insert that in the chain,
- * such that no targets further down see certain data, or see manipulated forms of the data.
- * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data
- * it received to HTML and sent it along to the next node in the chain, without printing it
- * anywhere.
- */
-public interface LogNode {
-
- /**
- * Instructs first LogNode in the list to print the log data provided.
- * @param priority Log level of the data being logged. Verbose, Error, etc.
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged. The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- public void println(int priority, String tag, String msg, Throwable tr);
-
-}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogView.java b/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogView.java
deleted file mode 100644
index c01542b91..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogView.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.android.common.logger;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.*;
-import android.widget.TextView;
-
-/** Simple TextView which is used to output log data received through the LogNode interface.
-*/
-public class LogView extends TextView implements LogNode {
-
- public LogView(Context context) {
- super(context);
- }
-
- public LogView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public LogView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- /**
- * Formats the log data and prints it out to the LogView.
- * @param priority Log level of the data being logged. Verbose, Error, etc.
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged. The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- @Override
- public void println(int priority, String tag, String msg, Throwable tr) {
-
-
- String priorityStr = null;
-
- // For the purposes of this View, we want to print the priority as readable text.
- switch(priority) {
- case android.util.Log.VERBOSE:
- priorityStr = "VERBOSE";
- break;
- case android.util.Log.DEBUG:
- priorityStr = "DEBUG";
- break;
- case android.util.Log.INFO:
- priorityStr = "INFO";
- break;
- case android.util.Log.WARN:
- priorityStr = "WARN";
- break;
- case android.util.Log.ERROR:
- priorityStr = "ERROR";
- break;
- case android.util.Log.ASSERT:
- priorityStr = "ASSERT";
- break;
- default:
- break;
- }
-
- // Handily, the Log class has a facility for converting a stack trace into a usable string.
- String exceptionStr = null;
- if (tr != null) {
- exceptionStr = android.util.Log.getStackTraceString(tr);
- }
-
- // Take the priority, tag, message, and exception, and concatenate as necessary
- // into one usable line of text.
- final StringBuilder outputBuilder = new StringBuilder();
-
- String delimiter = "\t";
- appendIfNotNull(outputBuilder, priorityStr, delimiter);
- appendIfNotNull(outputBuilder, tag, delimiter);
- appendIfNotNull(outputBuilder, msg, delimiter);
- appendIfNotNull(outputBuilder, exceptionStr, delimiter);
-
- // In case this was originally called from an AsyncTask or some other off-UI thread,
- // make sure the update occurs within the UI thread.
- ((Activity) getContext()).runOnUiThread( (new Thread(new Runnable() {
- @Override
- public void run() {
- // Display the text we just generated within the LogView.
- appendToLog(outputBuilder.toString());
- }
- })));
-
- if (mNext != null) {
- mNext.println(priority, tag, msg, tr);
- }
- }
-
- public LogNode getNext() {
- return mNext;
- }
-
- public void setNext(LogNode node) {
- mNext = node;
- }
-
- /** Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since
- * the logger takes so many arguments that might be null, this method helps cut out some of the
- * agonizing tedium of writing the same 3 lines over and over.
- * @param source StringBuilder containing the text to append to.
- * @param addStr The String to append
- * @param delimiter The String to separate the source and appended strings. A tab or comma,
- * for instance.
- * @return The fully concatenated String as a StringBuilder
- */
- private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) {
- if (addStr != null) {
- if (addStr.length() == 0) {
- delimiter = "";
- }
-
- return source.append(addStr).append(delimiter);
- }
- return source;
- }
-
- // The next LogNode in the chain.
- LogNode mNext;
-
- /** Outputs the string as a new line of log data in the LogView. */
- public void appendToLog(String s) {
- append("\n" + s);
- }
-
-
-}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogWrapper.java b/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogWrapper.java
deleted file mode 100644
index 16a9e7ba2..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/LogWrapper.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.android.common.logger;
-
-import android.util.Log;
-
-/**
- * Helper class which wraps Android's native Log utility in the Logger interface. This way
- * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously.
- */
-public class LogWrapper implements LogNode {
-
- // For piping: The next node to receive Log data after this one has done its work.
- private LogNode mNext;
-
- /**
- * Returns the next LogNode in the linked list.
- */
- public LogNode getNext() {
- return mNext;
- }
-
- /**
- * Sets the LogNode data will be sent to..
- */
- public void setNext(LogNode node) {
- mNext = node;
- }
-
- /**
- * Prints data out to the console using Android's native log mechanism.
- * @param priority Log level of the data being logged. Verbose, Error, etc.
- * @param tag Tag for for the log data. Can be used to organize log statements.
- * @param msg The actual message to be logged. The actual message to be logged.
- * @param tr If an exception was thrown, this can be sent along for the logging facilities
- * to extract and print useful information.
- */
- @Override
- public void println(int priority, String tag, String msg, Throwable tr) {
- // There actually are log methods that don't take a msg parameter. For now,
- // if that's the case, just convert null to the empty string and move on.
- String useMsg = msg;
- if (useMsg == null) {
- useMsg = "";
- }
-
- // If an exeption was provided, convert that exception to a usable string and attach
- // it to the end of the msg method.
- if (tr != null) {
- msg += "\n" + Log.getStackTraceString(tr);
- }
-
- // This is functionally identical to Log.x(tag, useMsg);
- // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg)
- Log.println(priority, tag, useMsg);
-
- // If this isn't the last node in the chain, move things along.
- if (mNext != null) {
- mNext.println(priority, tag, msg, tr);
- }
- }
-}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/MessageOnlyLogFilter.java b/samples/browseable/NetworkConnect/src/com.example.android.common.logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dcd4..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.common.logger/MessageOnlyLogFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.android.common.logger;
-
-/**
- * Simple {@link LogNode} filter, removes everything except the message.
- * Useful for situations like on-screen log output where you don't want a lot of metadata displayed,
- * just easy-to-read message updates as they're happening.
- */
-public class MessageOnlyLogFilter implements LogNode {
-
- LogNode mNext;
-
- /**
- * Takes the "next" LogNode as a parameter, to simplify chaining.
- *
- * @param next The next LogNode in the pipeline.
- */
- public MessageOnlyLogFilter(LogNode next) {
- mNext = next;
- }
-
- public MessageOnlyLogFilter() {
- }
-
- @Override
- public void println(int priority, String tag, String msg, Throwable tr) {
- if (mNext != null) {
- getNext().println(Log.NONE, null, msg, null);
- }
- }
-
- /**
- * Returns the next LogNode in the chain.
- */
- public LogNode getNext() {
- return mNext;
- }
-
- /**
- * Sets the LogNode data will be sent to..
- */
- public void setNext(LogNode node) {
- mNext = node;
- }
-
-}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/DownloadCallback.java b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/DownloadCallback.java
new file mode 100644
index 000000000..b553e8500
--- /dev/null
+++ b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/DownloadCallback.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.networkconnect;
+
+import android.net.NetworkInfo;
+import android.support.annotation.IntDef;
+
+/**
+ * Sample interface containing bare minimum methods needed for an asynchronous task
+ * to update the UI Context.
+ */
+
+public interface DownloadCallback {
+ interface Progress {
+ int ERROR = -1;
+ int CONNECT_SUCCESS = 0;
+ int GET_INPUT_STREAM_SUCCESS = 1;
+ int PROCESS_INPUT_STREAM_IN_PROGRESS = 2;
+ int PROCESS_INPUT_STREAM_SUCCESS = 3;
+ }
+
+ /**
+ * Indicates that the callback handler needs to update its appearance or information based on
+ * the result of the task. Expected to be called from the main thread.
+ */
+ void updateFromDownload(String result);
+
+ /**
+ * Get the device's active network status in the form of a NetworkInfo object.
+ */
+ NetworkInfo getActiveNetworkInfo();
+
+ /**
+ * Indicate to callback handler any progress update.
+ * @param progressCode must be one of the constants defined in DownloadCallback.Progress.
+ * @param percentComplete must be 0-100.
+ */
+ void onProgressUpdate(int progressCode, int percentComplete);
+
+ /**
+ * Indicates that the download operation has finished. This method is called even if the
+ * download hasn't completed successfully.
+ */
+ void finishDownloading();
+
+}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/MainActivity.java b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/MainActivity.java
index 3ad46463c..d490f5d10 100755
--- a/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/MainActivity.java
+++ b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/MainActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,55 +16,42 @@
package com.example.android.networkconnect;
-import android.os.AsyncTask;
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
-import android.util.TypedValue;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
-
-import com.example.android.common.logger.Log;
-import com.example.android.common.logger.LogFragment;
-import com.example.android.common.logger.LogWrapper;
-import com.example.android.common.logger.MessageOnlyLogFilter;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
+import android.widget.TextView;
/**
- * Sample application demonstrating how to connect to the network and fetch raw
- * HTML. It uses AsyncTask to do the fetch on a background thread. To establish
- * the network connection, it uses HttpURLConnection.
+ * Sample Activity demonstrating how to connect to the network and fetch raw
+ * HTML. It uses a Fragment that encapsulates the network operations on an AsyncTask.
*
- * This sample uses the logging framework to display log output in the log
- * fragment (LogFragment).
+ * This sample uses a TextView to display output.
*/
-public class MainActivity extends FragmentActivity {
+public class MainActivity extends FragmentActivity implements DownloadCallback {
- public static final String TAG = "Network Connect";
-
- // Reference to the fragment showing events, so we can clear it with a button
+ // Reference to the TextView showing fetched data, so we can clear it with a button
// as necessary.
- private LogFragment mLogFragment;
+ private TextView mDataText;
+
+ // Keep a reference to the NetworkFragment which owns the AsyncTask object
+ // that is used to execute network ops.
+ private NetworkFragment mNetworkFragment;
+
+ // Boolean telling us whether a download is in progress, so we don't trigger overlapping
+ // downloads with consecutive button clicks.
+ private boolean mDownloading = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.sample_main);
-
- // Initialize text fragment that displays intro text.
- SimpleTextFragment introFragment = (SimpleTextFragment)
- getSupportFragmentManager().findFragmentById(R.id.intro_fragment);
- introFragment.setText(R.string.welcome_message);
- introFragment.getTextView().setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16.0f);
-
- // Initialize the logging framework.
- initializeLogging();
+ mDataText = (TextView) findViewById(R.id.data_text);
+ mNetworkFragment = NetworkFragment.getInstance(getSupportFragmentManager(), "https://www.google.com");
}
@Override
@@ -79,111 +66,65 @@ public class MainActivity extends FragmentActivity {
// When the user clicks FETCH, fetch the first 500 characters of
// raw HTML from www.google.com.
case R.id.fetch_action:
- new DownloadTask().execute("http://www.google.com");
+ startDownload();
return true;
- // Clear the log view fragment.
+ // Clear the text and cancel download.
case R.id.clear_action:
- mLogFragment.getLogView().setText("");
- return true;
+ finishDownloading();
+ mDataText.setText("");
+ return true;
}
return false;
}
- /**
- * Implementation of AsyncTask, to fetch the data in the background away from
- * the UI thread.
- */
- private class DownloadTask extends AsyncTask {
-
- @Override
- protected String doInBackground(String... urls) {
- try {
- return loadFromNetwork(urls[0]);
- } catch (IOException e) {
- return getString(R.string.connection_error);
- }
- }
-
- /**
- * Uses the logging framework to display the output of the fetch
- * operation in the log fragment.
- */
- @Override
- protected void onPostExecute(String result) {
- Log.i(TAG, result);
+ private void startDownload() {
+ if (!mDownloading && mNetworkFragment != null) {
+ // Execute the async download.
+ mNetworkFragment.startDownload();
+ mDownloading = true;
}
}
- /** Initiates the fetch operation. */
- private String loadFromNetwork(String urlString) throws IOException {
- InputStream stream = null;
- String str ="";
-
- try {
- stream = downloadUrl(urlString);
- str = readIt(stream, 500);
- } finally {
- if (stream != null) {
- stream.close();
- }
+ @Override
+ public void updateFromDownload(String result) {
+ if (result != null) {
+ mDataText.setText(result);
+ } else {
+ mDataText.setText(getString(R.string.connection_error));
}
- return str;
}
- /**
- * Given a string representation of a URL, sets up a connection and gets
- * an input stream.
- * @param urlString A string representation of a URL.
- * @return An InputStream retrieved from a successful HttpURLConnection.
- * @throws java.io.IOException
- */
- private InputStream downloadUrl(String urlString) throws IOException {
- // BEGIN_INCLUDE(get_inputstream)
- URL url = new URL(urlString);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setReadTimeout(10000 /* milliseconds */);
- conn.setConnectTimeout(15000 /* milliseconds */);
- conn.setRequestMethod("GET");
- conn.setDoInput(true);
- // Start the query
- conn.connect();
- InputStream stream = conn.getInputStream();
- return stream;
- // END_INCLUDE(get_inputstream)
+ @Override
+ public NetworkInfo getActiveNetworkInfo() {
+ ConnectivityManager connectivityManager =
+ (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+ NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+ return networkInfo;
}
- /** Reads an InputStream and converts it to a String.
- * @param stream InputStream containing HTML from targeted site.
- * @param len Length of string that this method returns.
- * @return String concatenated according to len parameter.
- * @throws java.io.IOException
- * @throws java.io.UnsupportedEncodingException
- */
- private String readIt(InputStream stream, int len) throws IOException, UnsupportedEncodingException {
- Reader reader = null;
- reader = new InputStreamReader(stream, "UTF-8");
- char[] buffer = new char[len];
- reader.read(buffer);
- return new String(buffer);
+ @Override
+ public void finishDownloading() {
+ mDownloading = false;
+ if (mNetworkFragment != null) {
+ mNetworkFragment.cancelDownload();
+ }
}
- /** Create a chain of targets that will receive log data */
- public void initializeLogging() {
-
- // Using Log, front-end to the logging chain, emulates
- // android.util.log method signatures.
-
- // Wraps Android's native log framework
- LogWrapper logWrapper = new LogWrapper();
- Log.setLogNode(logWrapper);
-
- // A filter that strips out everything except the message text.
- MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter();
- logWrapper.setNext(msgFilter);
-
- // On screen logging via a fragment with a TextView.
- mLogFragment =
- (LogFragment) getSupportFragmentManager().findFragmentById(R.id.log_fragment);
- msgFilter.setNext(mLogFragment.getLogView());
+ @Override
+ public void onProgressUpdate(int progressCode, int percentComplete) {
+ switch(progressCode) {
+ // You can add UI behavior for progress updates here.
+ case Progress.ERROR:
+ break;
+ case Progress.CONNECT_SUCCESS:
+ break;
+ case Progress.GET_INPUT_STREAM_SUCCESS:
+ break;
+ case Progress.PROCESS_INPUT_STREAM_IN_PROGRESS:
+ mDataText.setText("" + percentComplete + "%");
+ break;
+ case Progress.PROCESS_INPUT_STREAM_SUCCESS:
+ break;
+ }
}
}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/NetworkFragment.java b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/NetworkFragment.java
new file mode 100644
index 000000000..cc41075a1
--- /dev/null
+++ b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/NetworkFragment.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.networkconnect;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+
+import javax.net.ssl.HttpsURLConnection;
+
+/**
+ * Implementation of headless Fragment that runs an AsyncTask to fetch data from the network.
+ */
+public class NetworkFragment extends Fragment {
+ public static final String TAG = "NetworkFragment";
+
+ private static final String URL_KEY = "UrlKey";
+
+ private DownloadCallback mCallback;
+ private DownloadTask mDownloadTask;
+ private String mUrlString;
+
+ /**
+ * Static initializer for NetworkFragment that sets the URL of the host it will be downloading
+ * from.
+ */
+ public static NetworkFragment getInstance(FragmentManager fragmentManager, String url) {
+ // Recover NetworkFragment in case we are re-creating the Activity due to a config change.
+ // This is necessary because NetworkFragment might have a task that began running before
+ // the config change and has not finished yet.
+ // The NetworkFragment is recoverable via this method because it calls
+ // setRetainInstance(true) upon creation.
+ NetworkFragment networkFragment = (NetworkFragment) fragmentManager
+ .findFragmentByTag(NetworkFragment.TAG);
+ if (networkFragment == null) {
+ networkFragment = new NetworkFragment();
+ Bundle args = new Bundle();
+ args.putString(URL_KEY, url);
+ networkFragment.setArguments(args);
+ fragmentManager.beginTransaction().add(networkFragment, TAG).commit();
+ }
+ return networkFragment;
+ }
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ // Retain this Fragment across configuration changes in the host Activity.
+ setRetainInstance(true);
+ mUrlString = getArguments().getString(URL_KEY);
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ // Host Activity will handle callbacks from task.
+ mCallback = (DownloadCallback)context;
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ // Clear reference to host Activity.
+ mCallback = null;
+ }
+
+ @Override
+ public void onDestroy() {
+ // Cancel task when Fragment is destroyed.
+ cancelDownload();
+ super.onDestroy();
+ }
+
+ /**
+ * Start non-blocking execution of DownloadTask.
+ */
+ public void startDownload() {
+ cancelDownload();
+ mDownloadTask = new DownloadTask();
+ mDownloadTask.execute(mUrlString);
+ }
+
+ /**
+ * Cancel (and interrupt if necessary) any ongoing DownloadTask execution.
+ */
+ public void cancelDownload() {
+ if (mDownloadTask != null) {
+ mDownloadTask.cancel(true);
+ mDownloadTask = null;
+ }
+ }
+
+ /**
+ * Implementation of AsyncTask that runs a network operation on a background thread.
+ */
+ private class DownloadTask extends AsyncTask {
+
+ /**
+ * Wrapper class that serves as a union of a result value and an exception. When the
+ * download task has completed, either the result value or exception can be a non-null
+ * value. This allows you to pass exceptions to the UI thread that were thrown during
+ * doInBackground().
+ */
+ class Result {
+ public String mResultValue;
+ public Exception mException;
+ public Result(String resultValue) {
+ mResultValue = resultValue;
+ }
+ public Result(Exception exception) {
+ mException = exception;
+ }
+ }
+
+ /**
+ * Cancel background network operation if we do not have network connectivity.
+ */
+ @Override
+ protected void onPreExecute() {
+ if (mCallback != null) {
+ NetworkInfo networkInfo = mCallback.getActiveNetworkInfo();
+ if (networkInfo == null || !networkInfo.isConnected() ||
+ (networkInfo.getType() != ConnectivityManager.TYPE_WIFI
+ && networkInfo.getType() != ConnectivityManager.TYPE_MOBILE)) {
+ // If no connectivity, cancel task and update Callback with null data.
+ mCallback.updateFromDownload(null);
+ cancel(true);
+ }
+ }
+ }
+
+ /**
+ * Defines work to perform on the background thread.
+ */
+ @Override
+ protected Result doInBackground(String... urls) {
+ Result result = null;
+ if (!isCancelled() && urls != null && urls.length > 0) {
+ String urlString = urls[0];
+ try {
+ URL url = new URL(urlString);
+ String resultString = downloadUrl(url);
+ if (resultString != null) {
+ result = new Result(resultString);
+ } else {
+ throw new IOException("No response received.");
+ }
+ } catch(Exception e) {
+ result = new Result(e);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Send DownloadCallback a progress update.
+ */
+ @Override
+ protected void onProgressUpdate(Integer... values) {
+ super.onProgressUpdate(values);
+ if (values.length >= 2) {
+ mCallback.onProgressUpdate(values[0], values[1]);
+ }
+ }
+
+ /**
+ * Updates the DownloadCallback with the result.
+ */
+ @Override
+ protected void onPostExecute(Result result) {
+ if (result != null && mCallback != null) {
+ if (result.mException != null) {
+ mCallback.updateFromDownload(result.mException.getMessage());
+ } else if (result.mResultValue != null) {
+ mCallback.updateFromDownload(result.mResultValue);
+ }
+ mCallback.finishDownloading();
+ }
+ }
+
+ /**
+ * Override to add special behavior for cancelled AsyncTask.
+ */
+ @Override
+ protected void onCancelled(Result result) {
+ }
+
+ /**
+ * Given a URL, sets up a connection and gets the HTTP response body from the server.
+ * If the network request is successful, it returns the response body in String form. Otherwise,
+ * it will throw an IOException.
+ */
+ private String downloadUrl(URL url) throws IOException {
+ InputStream stream = null;
+ HttpsURLConnection connection = null;
+ String result = null;
+ try {
+ connection = (HttpsURLConnection) url.openConnection();
+ // Timeout for reading InputStream arbitrarily set to 3000ms.
+ connection.setReadTimeout(3000);
+ // Timeout for connection.connect() arbitrarily set to 3000ms.
+ connection.setConnectTimeout(3000);
+ // For this use case, set HTTP method to GET.
+ connection.setRequestMethod("GET");
+ // Already true by default but setting just in case; needs to be true since this request
+ // is carrying an input (response) body.
+ connection.setDoInput(true);
+ // Open communications link (network traffic occurs here).
+ connection.connect();
+ publishProgress(DownloadCallback.Progress.CONNECT_SUCCESS);
+ int responseCode = connection.getResponseCode();
+ if (responseCode != HttpsURLConnection.HTTP_OK) {
+ throw new IOException("HTTP error code: " + responseCode);
+ }
+ // Retrieve the response body as an InputStream.
+ stream = connection.getInputStream();
+ publishProgress(DownloadCallback.Progress.GET_INPUT_STREAM_SUCCESS, 0);
+ if (stream != null) {
+ // Converts Stream to String with max length of 500.
+ result = readStream(stream, 500);
+ publishProgress(DownloadCallback.Progress.PROCESS_INPUT_STREAM_SUCCESS, 0);
+ }
+ } finally {
+ // Close Stream and disconnect HTTPS connection.
+ if (stream != null) {
+ stream.close();
+ }
+ if (connection != null) {
+ connection.disconnect();
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Converts the contents of an InputStream to a String.
+ */
+ private String readStream(InputStream stream, int maxLength) throws IOException {
+ String result = null;
+ // Read InputStream using the UTF-8 charset.
+ InputStreamReader reader = new InputStreamReader(stream, "UTF-8");
+ // Create temporary buffer to hold Stream data with specified max length.
+ char[] buffer = new char[maxLength];
+ // Populate temporary buffer with Stream data.
+ int numChars = 0;
+ int readSize = 0;
+ while (numChars < maxLength && readSize != -1) {
+ numChars += readSize;
+ int pct = (100 * numChars) / maxLength;
+ publishProgress(DownloadCallback.Progress.PROCESS_INPUT_STREAM_IN_PROGRESS, pct);
+ readSize = reader.read(buffer, numChars, buffer.length - numChars);
+ }
+ if (numChars != -1) {
+ // The stream was not empty.
+ // Create String that is actual length of response body if actual length was less than
+ // max length.
+ numChars = Math.min(numChars, maxLength);
+ result = new String(buffer, 0, numChars);
+ }
+ return result;
+ }
+ }
+}
diff --git a/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/SimpleTextFragment.java b/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/SimpleTextFragment.java
deleted file mode 100644
index 320293760..000000000
--- a/samples/browseable/NetworkConnect/src/com.example.android.networkconnect/SimpleTextFragment.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.networkconnect;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-/**
- * Simple fragment containing only a TextView. Used by TextPagerAdapter to create
- * tutorial-style pages for apps.
- */
-public class SimpleTextFragment extends Fragment {
-
- // Contains the text that will be displayed by this Fragment
- String mText;
-
- // Contains a resource ID for the text that will be displayed by this fragment.
- int mTextId = -1;
-
- // Keys which will be used to store/retrieve text passed in via setArguments.
- public static final String TEXT_KEY = "text";
- public static final String TEXT_ID_KEY = "text_id";
-
- // For situations where the app wants to modify text at Runtime, exposing the TextView.
- private TextView mTextView;
-
- public SimpleTextFragment() {
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- // Before initializing the textView, check if any arguments were provided via setArguments.
- processArguments();
-
- // Create a new TextView and set its text to whatever was provided.
- mTextView = new TextView(getActivity());
- mTextView.setGravity(Gravity.CENTER);
-
- if (mText != null) {
- mTextView.setText(mText);
- Log.i("SimpleTextFragment", mText);
- }
- return mTextView;
- }
-
- public TextView getTextView() {
- return mTextView;
- }
-
- /**
- * Changes the text for this TextView, according to the resource ID provided.
- * @param stringId A resource ID representing the text content for this Fragment's TextView.
- */
- public void setText(int stringId) {
- getTextView().setText(getActivity().getString(stringId));
- }
-
- /**
- * Processes the arguments passed into this Fragment via setArguments method.
- * Currently the method only looks for text or a textID, nothing else.
- */
- public void processArguments() {
- // For most objects we'd handle the multiple possibilities for initialization variables
- // as multiple constructors. For Fragments, however, it's customary to use
- // setArguments / getArguments.
- if (getArguments() != null) {
- Bundle args = getArguments();
- if (args.containsKey(TEXT_KEY)) {
- mText = args.getString(TEXT_KEY);
- Log.d("Constructor", "Added Text.");
- } else if (args.containsKey(TEXT_ID_KEY)) {
- mTextId = args.getInt(TEXT_ID_KEY);
- mText = getString(mTextId);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/samples/browseable/Notifications/Application/AndroidManifest.xml b/samples/browseable/Notifications/Application/AndroidManifest.xml
index 6a17ad8c3..4b0a9b3a9 100644
--- a/samples/browseable/Notifications/Application/AndroidManifest.xml
+++ b/samples/browseable/Notifications/Application/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.support.wearable.notifications" >
+ android:targetSdkVersion="25" />
diff --git a/samples/browseable/Notifications/Application/res/values/base-strings.xml b/samples/browseable/Notifications/Application/res/values/base-strings.xml
index 9ab282f7e..c5ef0694c 100644
--- a/samples/browseable/Notifications/Application/res/values/base-strings.xml
+++ b/samples/browseable/Notifications/Application/res/values/base-strings.xml
@@ -16,7 +16,7 @@
-->
- Wearable Notifications
+ Notifications
-
+
@@ -28,6 +28,10 @@
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault.Light" >
+
+
diff --git a/samples/browseable/Notifications/_index.jd b/samples/browseable/Notifications/_index.jd
index e2bfa36b3..50d2020fb 100644
--- a/samples/browseable/Notifications/_index.jd
+++ b/samples/browseable/Notifications/_index.jd
@@ -1,5 +1,5 @@
-page.tags="Wearable Notifications"
+page.tags="Notifications"
sample.group=Wearable
@jd:body
diff --git a/samples/browseable/PdfRendererBasic/src/com.example.android.pdfrendererbasic/PdfRendererBasicFragment.java b/samples/browseable/PdfRendererBasic/src/com.example.android.pdfrendererbasic/PdfRendererBasicFragment.java
index e413c6599..20b0a7f45 100644
--- a/samples/browseable/PdfRendererBasic/src/com.example.android.pdfrendererbasic/PdfRendererBasicFragment.java
+++ b/samples/browseable/PdfRendererBasic/src/com.example.android.pdfrendererbasic/PdfRendererBasicFragment.java
@@ -30,7 +30,10 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.Toast;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
/**
* This fragment has a big {@ImageView} that shows PDF pages, and 2 {@link android.widget.Button}s to move between
@@ -43,6 +46,11 @@ public class PdfRendererBasicFragment extends Fragment implements View.OnClickLi
*/
private static final String STATE_CURRENT_PAGE_INDEX = "current_page_index";
+ /**
+ * The filename of the PDF.
+ */
+ private static final String FILENAME = "sample.pdf";
+
/**
* File descriptor of the PDF.
*/
@@ -136,7 +144,21 @@ public class PdfRendererBasicFragment extends Fragment implements View.OnClickLi
*/
private void openRenderer(Context context) throws IOException {
// In this sample, we read a PDF from the assets directory.
- mFileDescriptor = context.getAssets().openFd("sample.pdf").getParcelFileDescriptor();
+ File file = new File(context.getCacheDir(), FILENAME);
+ if (!file.exists()) {
+ // Since PdfRenderer cannot handle the compressed asset file directly, we copy it into
+ // the cache directory.
+ InputStream asset = context.getAssets().open(FILENAME);
+ FileOutputStream output = new FileOutputStream(file);
+ final byte[] buffer = new byte[1024];
+ int size;
+ while ((size = asset.read(buffer)) != -1) {
+ output.write(buffer, 0, size);
+ }
+ asset.close();
+ output.close();
+ }
+ mFileDescriptor = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
// This is the PdfRenderer we use to render the PDF.
mPdfRenderer = new PdfRenderer(mFileDescriptor);
}
diff --git a/samples/browseable/PermissionRequest/res/values/strings.xml b/samples/browseable/PermissionRequest/res/values/strings.xml
index c3e5574dc..248876601 100644
--- a/samples/browseable/PermissionRequest/res/values/strings.xml
+++ b/samples/browseable/PermissionRequest/res/values/strings.xml
@@ -15,6 +15,7 @@
limitations under the License.
-->
+ This sample app uses camera.This web page wants to use following resources:\n\n%sAllowDeny
diff --git a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/ConfirmationDialogFragment.java b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/ConfirmationDialogFragment.java
index 7dae56efd..ca173b424 100644
--- a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/ConfirmationDialogFragment.java
+++ b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/ConfirmationDialogFragment.java
@@ -13,12 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.example.android.permissionrequest;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
+import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.TextUtils;
@@ -32,7 +34,7 @@ public class ConfirmationDialogFragment extends DialogFragment {
/**
* Creates a new instance of ConfirmationDialogFragment.
*
- * @param resources The list of resources requested by PermissionRequeste.
+ * @param resources The list of resources requested by PermissionRequest.
* @return A new instance.
*/
public static ConfirmationDialogFragment newInstance(String[] resources) {
@@ -43,21 +45,22 @@ public class ConfirmationDialogFragment extends DialogFragment {
return fragment;
}
+ @NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- String[] resources = getArguments().getStringArray(ARG_RESOURCES);
+ final String[] resources = getArguments().getStringArray(ARG_RESOURCES);
return new AlertDialog.Builder(getActivity())
.setMessage(getString(R.string.confirmation, TextUtils.join("\n", resources)))
.setNegativeButton(R.string.deny, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- ((Listener) getParentFragment()).onConfirmation(false);
+ ((Listener) getParentFragment()).onConfirmation(false, resources);
}
})
.setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- ((Listener) getParentFragment()).onConfirmation(true);
+ ((Listener) getParentFragment()).onConfirmation(true, resources);
}
})
.create();
@@ -66,14 +69,15 @@ public class ConfirmationDialogFragment extends DialogFragment {
/**
* Callback for the user's response.
*/
- public interface Listener {
+ interface Listener {
/**
- * Called when the PermissoinRequest is allowed or denied by the user.
+ * Called when the PermissionRequest is allowed or denied by the user.
*
- * @param allowed True if the user allowed the request.
+ * @param allowed True if the user allowed the request.
+ * @param resources The resources to be granted.
*/
- public void onConfirmation(boolean allowed);
+ void onConfirmation(boolean allowed, String[] resources);
}
}
diff --git a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/MessageDialogFragment.java b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/MessageDialogFragment.java
new file mode 100644
index 000000000..31d0bcbf7
--- /dev/null
+++ b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/MessageDialogFragment.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.permissionrequest;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.support.v4.app.DialogFragment;
+
+/**
+ * Shows a dialog with a brief message.
+ */
+public class MessageDialogFragment extends DialogFragment {
+
+ private static final String ARG_MESSAGE_RES_ID = "message_res_id";
+
+ public static MessageDialogFragment newInstance(@StringRes int message) {
+ MessageDialogFragment fragment = new MessageDialogFragment();
+ Bundle args = new Bundle();
+ args.putInt(ARG_MESSAGE_RES_ID, message);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ return new AlertDialog.Builder(getContext())
+ .setMessage(getArguments().getInt(ARG_MESSAGE_RES_ID))
+ .setCancelable(false)
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ ((Listener) getParentFragment()).onOkClicked();
+ }
+ })
+ .create();
+ }
+
+ interface Listener {
+ void onOkClicked();
+ }
+
+}
diff --git a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/PermissionRequestFragment.java b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/PermissionRequestFragment.java
index 44f1d6ec5..418c90d34 100644
--- a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/PermissionRequestFragment.java
+++ b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/PermissionRequestFragment.java
@@ -16,12 +16,15 @@
package com.example.android.permissionrequest;
+import android.Manifest;
import android.annotation.SuppressLint;
+import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -37,12 +40,14 @@ import com.example.android.common.logger.Log;
* This fragment shows a {@link WebView} and loads a web app from the {@link SimpleWebServer}.
*/
public class PermissionRequestFragment extends Fragment
- implements ConfirmationDialogFragment.Listener {
+ implements ConfirmationDialogFragment.Listener, MessageDialogFragment.Listener {
private static final String TAG = PermissionRequestFragment.class.getSimpleName();
private static final String FRAGMENT_DIALOG = "dialog";
+ private static final int REQUEST_CAMERA_PERMISSION = 1;
+
/**
* We use this web server to serve HTML files in the assets folder. This is because we cannot
* use the JavaScript method "getUserMedia" from "file:///android_assets/..." URLs.
@@ -67,7 +72,7 @@ public class PermissionRequestFragment extends Fragment
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
- @Nullable Bundle savedInstanceState) {
+ @Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_permission_request, container, false);
}
@@ -85,7 +90,14 @@ public class PermissionRequestFragment extends Fragment
final int port = 8080;
mWebServer = new SimpleWebServer(port, getResources().getAssets());
mWebServer.start();
- mWebView.loadUrl("http://localhost:" + port + "/sample.html");
+ // This is for runtime permission on Marshmallow and above; It is not directly related to
+ // PermissionRequest API.
+ if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.CAMERA)
+ != PackageManager.PERMISSION_GRANTED) {
+ requestCameraPermission();
+ } else {
+ mWebView.loadUrl("http://localhost:" + port + "/sample.html");
+ }
}
@Override
@@ -94,6 +106,32 @@ public class PermissionRequestFragment extends Fragment
super.onPause();
}
+ @Override
+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+ @NonNull int[] grantResults) {
+ // This is for runtime permission on Marshmallow and above; It is not directly related to
+ // PermissionRequest API.
+ if (requestCode == REQUEST_CAMERA_PERMISSION) {
+ if (permissions.length != 1 || grantResults.length != 1 ||
+ grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+ Log.e(TAG, "Camera permission not granted.");
+ } else if (mWebView != null && mWebServer != null) {
+ mWebView.loadUrl("http://localhost:" + mWebServer.getPort() + "/sample.html");
+ }
+ } else {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+ }
+ }
+
+ private void requestCameraPermission() {
+ if (shouldShowRequestPermissionRationale(Manifest.permission.CAMERA)) {
+ MessageDialogFragment.newInstance(R.string.permission_message)
+ .show(getChildFragmentManager(), FRAGMENT_DIALOG);
+ } else {
+ requestPermissions(new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSION);
+ }
+ }
+
@SuppressLint("SetJavaScriptEnabled")
private static void configureWebSettings(WebSettings settings) {
settings.setJavaScriptEnabled(true);
@@ -110,8 +148,16 @@ public class PermissionRequestFragment extends Fragment
public void onPermissionRequest(PermissionRequest request) {
Log.i(TAG, "onPermissionRequest");
mPermissionRequest = request;
- ConfirmationDialogFragment.newInstance(request.getResources())
- .show(getChildFragmentManager(), FRAGMENT_DIALOG);
+ final String[] requestedResources = request.getResources();
+ for (String r : requestedResources) {
+ if (r.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
+ // In this sample, we only accept video capture request.
+ ConfirmationDialogFragment
+ .newInstance(new String[]{PermissionRequest.RESOURCE_VIDEO_CAPTURE})
+ .show(getChildFragmentManager(), FRAGMENT_DIALOG);
+ break;
+ }
+ }
}
// This method is called when the permission request is canceled by the web content.
@@ -155,9 +201,14 @@ public class PermissionRequestFragment extends Fragment
};
@Override
- public void onConfirmation(boolean allowed) {
+ public void onOkClicked() {
+ requestPermissions(new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSION);
+ }
+
+ @Override
+ public void onConfirmation(boolean allowed, String[] resources) {
if (allowed) {
- mPermissionRequest.grant(mPermissionRequest.getResources());
+ mPermissionRequest.grant(resources);
Log.d(TAG, "Permission granted.");
} else {
mPermissionRequest.deny();
@@ -174,7 +225,7 @@ public class PermissionRequestFragment extends Fragment
* For testing.
*/
public interface ConsoleMonitor {
- public void onConsoleMessage(ConsoleMessage message);
+ void onConsoleMessage(ConsoleMessage message);
}
}
diff --git a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/SimpleWebServer.java b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/SimpleWebServer.java
index 36b7c4693..b02275af5 100644
--- a/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/SimpleWebServer.java
+++ b/samples/browseable/PermissionRequest/src/com.example.android.permissionrequest/SimpleWebServer.java
@@ -90,6 +90,10 @@ public class SimpleWebServer implements Runnable {
}
}
+ public int getPort() {
+ return mPort;
+ }
+
@Override
public void run() {
try {
diff --git a/samples/browseable/RepeatingAlarm/res/menu/main.xml b/samples/browseable/RepeatingAlarm/res/menu/main.xml
index 2c3515dd4..498f2c60e 100644
--- a/samples/browseable/RepeatingAlarm/res/menu/main.xml
+++ b/samples/browseable/RepeatingAlarm/res/menu/main.xml
@@ -14,8 +14,9 @@
limitations under the License.
-->
-
diff --git a/samples/browseable/ShareActionProvider/_index.jd b/samples/browseable/ShareActionProvider/_index.jd
new file mode 100644
index 000000000..ae52e4ec8
--- /dev/null
+++ b/samples/browseable/ShareActionProvider/_index.jd
@@ -0,0 +1,10 @@
+
+page.tags="ShareActionProvider"
+sample.group=UI
+@jd:body
+
+
+
+ This sample shows you how a provide a context-sensitive ShareActionProvider.
+
+
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/ic_launcher.png b/samples/browseable/ShareActionProvider/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/ic_launcher.png
rename to samples/browseable/ShareActionProvider/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/tile.9.png b/samples/browseable/ShareActionProvider/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/tile.9.png
rename to samples/browseable/ShareActionProvider/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-mdpi/ic_launcher.png b/samples/browseable/ShareActionProvider/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-mdpi/ic_launcher.png
rename to samples/browseable/ShareActionProvider/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/ShareActionProvider/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xhdpi/ic_launcher.png
rename to samples/browseable/ShareActionProvider/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png
rename to samples/browseable/ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_image.xml b/samples/browseable/ShareActionProvider/res/layout/item_image.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_image.xml
rename to samples/browseable/ShareActionProvider/res/layout/item_image.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_text.xml b/samples/browseable/ShareActionProvider/res/layout/item_text.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_text.xml
rename to samples/browseable/ShareActionProvider/res/layout/item_text.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/sample_main.xml b/samples/browseable/ShareActionProvider/res/layout/sample_main.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/sample_main.xml
rename to samples/browseable/ShareActionProvider/res/layout/sample_main.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/menu/main_menu.xml b/samples/browseable/ShareActionProvider/res/menu/main_menu.xml
similarity index 82%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/menu/main_menu.xml
rename to samples/browseable/ShareActionProvider/res/menu/main_menu.xml
index acd213417..4b8526736 100644
--- a/samples/browseable/ActionBarCompat-ShareActionProvider/res/menu/main_menu.xml
+++ b/samples/browseable/ShareActionProvider/res/menu/main_menu.xml
@@ -16,8 +16,7 @@
-->
-
\ No newline at end of file
+
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-dimens.xml b/samples/browseable/ShareActionProvider/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-dimens.xml
rename to samples/browseable/ShareActionProvider/res/values-sw600dp/template-dimens.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-styles.xml b/samples/browseable/ShareActionProvider/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-styles.xml
rename to samples/browseable/ShareActionProvider/res/values-sw600dp/template-styles.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v11/template-styles.xml b/samples/browseable/ShareActionProvider/res/values-v11/template-styles.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v11/template-styles.xml
rename to samples/browseable/ShareActionProvider/res/values-v11/template-styles.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v21/base-colors.xml b/samples/browseable/ShareActionProvider/res/values-v21/base-colors.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v21/base-colors.xml
rename to samples/browseable/ShareActionProvider/res/values-v21/base-colors.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v21/base-template-styles.xml b/samples/browseable/ShareActionProvider/res/values-v21/base-template-styles.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v21/base-template-styles.xml
rename to samples/browseable/ShareActionProvider/res/values-v21/base-template-styles.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/base-strings.xml b/samples/browseable/ShareActionProvider/res/values/base-strings.xml
similarity index 83%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values/base-strings.xml
rename to samples/browseable/ShareActionProvider/res/values/base-strings.xml
index 21d17e4f5..ab5e2fbdc 100644
--- a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/base-strings.xml
+++ b/samples/browseable/ShareActionProvider/res/values/base-strings.xml
@@ -16,13 +16,12 @@
-->
- ActionBarCompat-ShareActionProvider
+ ShareActionProvider
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/strings.xml b/samples/browseable/ShareActionProvider/res/values/strings.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values/strings.xml
rename to samples/browseable/ShareActionProvider/res/values/strings.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-dimens.xml b/samples/browseable/ShareActionProvider/res/values/template-dimens.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-dimens.xml
rename to samples/browseable/ShareActionProvider/res/values/template-dimens.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-styles.xml b/samples/browseable/ShareActionProvider/res/values/template-styles.xml
similarity index 100%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-styles.xml
rename to samples/browseable/ShareActionProvider/res/values/template-styles.xml
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java b/samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/MainActivity.java
similarity index 93%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java
rename to samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/MainActivity.java
index 545764cad..3ac28ea62 100644
--- a/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java
+++ b/samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/MainActivity.java
@@ -14,14 +14,16 @@
* limitations under the License.
*/
-package com.example.android.actionbarcompat.shareactionprovider;
+package com.example.android.shareactionprovider;
+
+import com.example.android.shareactionprovider.content.ContentItem;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.ShareActionProvider;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -31,8 +33,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
-import com.example.android.actionbarcompat.shareactionprovider.content.ContentItem;
-
import java.util.ArrayList;
/**
@@ -43,10 +43,8 @@ import java.util.ArrayList;
* text. When a new item is selected in the ViewPager, the ShareActionProvider is updated with
* a share intent specific to that content.
*
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
- * necessary to display a compatible Action Bar on devices running Android v2.1+.
*/
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
// The items to be displayed in the ViewPager
private final ArrayList mItems = getSampleContent();
@@ -65,7 +63,7 @@ public class MainActivity extends ActionBarActivity {
ViewPager vp = (ViewPager) findViewById(R.id.viewpager);
// Set an OnPageChangeListener so we are notified when a new item is selected
- vp.setOnPageChangeListener(mOnPageChangeListener);
+ vp.addOnPageChangeListener(mOnPageChangeListener);
// Finally set the adapter so the ViewPager can display items
vp.setAdapter(mPagerAdapter);
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java b/samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/content/AssetProvider.java
similarity index 72%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java
rename to samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/content/AssetProvider.java
index b60f7d78b..21e3ab2a8 100644
--- a/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java
+++ b/samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/content/AssetProvider.java
@@ -14,14 +14,16 @@
* limitations under the License.
*/
-package com.example.android.actionbarcompat.shareactionprovider.content;
+package com.example.android.shareactionprovider.content;
import android.content.ContentProvider;
import android.content.ContentValues;
+import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.content.res.AssetManager;
import android.database.Cursor;
import android.net.Uri;
+import android.support.annotation.NonNull;
import android.text.TextUtils;
import java.io.FileNotFoundException;
@@ -41,38 +43,41 @@ public class AssetProvider extends ContentProvider {
}
@Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
+ public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
// Do not support delete requests.
return 0;
}
@Override
- public String getType(Uri uri) {
+ public String getType(@NonNull Uri uri) {
// Do not support returning the data type
return null;
}
@Override
- public Uri insert(Uri uri, ContentValues values) {
+ public Uri insert(@NonNull Uri uri, ContentValues values) {
// Do not support insert requests.
return null;
}
@Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ public Cursor query(@NonNull Uri uri, String[] projection, String selection,
+ String[] selectionArgs,
String sortOrder) {
// Do not support query requests.
return null;
}
@Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ public int update(@NonNull Uri uri, ContentValues values, String selection,
+ String[] selectionArgs) {
// Do not support update requests.
return 0;
}
@Override
- public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
+ public AssetFileDescriptor openAssetFile(@NonNull Uri uri, @NonNull String mode)
+ throws FileNotFoundException {
// The asset file name should be the last path segment
final String assetName = uri.getLastPathSegment();
@@ -83,7 +88,11 @@ public class AssetProvider extends ContentProvider {
try {
// Try and return a file descriptor for the given asset name
- AssetManager am = getContext().getAssets();
+ Context context = getContext();
+ if (context == null) {
+ return super.openAssetFile(uri, mode);
+ }
+ AssetManager am = context.getAssets();
return am.openFd(assetName);
} catch (IOException e) {
e.printStackTrace();
diff --git a/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java b/samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/content/ContentItem.java
similarity index 91%
rename from samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java
rename to samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/content/ContentItem.java
index 756a9e66d..5806088b7 100644
--- a/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java
+++ b/samples/browseable/ShareActionProvider/src/com.example.android.shareactionprovider/content/ContentItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.example.android.actionbarcompat.shareactionprovider.content;
+package com.example.android.shareactionprovider.content;
import android.content.Context;
import android.content.Intent;
@@ -33,7 +33,7 @@ public class ContentItem {
public final int contentType;
public final int contentResourceId;
- public final String contentAssetFilePath;
+ private final String mContentAssetFilePath;
/**
* Creates a ContentItem with the specified type, referencing a resource id.
@@ -44,7 +44,7 @@ public class ContentItem {
public ContentItem(int type, int resourceId) {
contentType = type;
contentResourceId = resourceId;
- contentAssetFilePath = null;
+ mContentAssetFilePath = null;
}
/**
@@ -55,7 +55,7 @@ public class ContentItem {
*/
public ContentItem(int type, String assetFilePath) {
contentType = type;
- contentAssetFilePath = assetFilePath;
+ mContentAssetFilePath = assetFilePath;
contentResourceId = 0;
}
@@ -63,9 +63,9 @@ public class ContentItem {
* @return Uri to the content
*/
public Uri getContentUri() {
- if (!TextUtils.isEmpty(contentAssetFilePath)) {
+ if (!TextUtils.isEmpty(mContentAssetFilePath)) {
// If this content has an asset, then return a AssetProvider Uri
- return Uri.parse("content://" + AssetProvider.CONTENT_URI + "/" + contentAssetFilePath);
+ return Uri.parse("content://" + AssetProvider.CONTENT_URI + "/" + mContentAssetFilePath);
} else {
return null;
}
diff --git a/samples/browseable/SpeedTracker/Application/AndroidManifest.xml b/samples/browseable/SpeedTracker/Application/AndroidManifest.xml
index debd11d6f..bf86a10cc 100644
--- a/samples/browseable/SpeedTracker/Application/AndroidManifest.xml
+++ b/samples/browseable/SpeedTracker/Application/AndroidManifest.xml
@@ -5,7 +5,7 @@
+ android:targetSdkVersion="25" />
diff --git a/samples/browseable/SpeedTracker/Application/res/layout/main_activity.xml b/samples/browseable/SpeedTracker/Application/res/layout/main_activity.xml
index 17a8f6a9d..ef2480a61 100644
--- a/samples/browseable/SpeedTracker/Application/res/layout/main_activity.xml
+++ b/samples/browseable/SpeedTracker/Application/res/layout/main_activity.xml
@@ -43,10 +43,10 @@
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
-
\ No newline at end of file
+
diff --git a/samples/browseable/SpeedTracker/Application/res/values/base-strings.xml b/samples/browseable/SpeedTracker/Application/res/values/base-strings.xml
index 61f103ceb..b5e0a236b 100644
--- a/samples/browseable/SpeedTracker/Application/res/values/base-strings.xml
+++ b/samples/browseable/SpeedTracker/Application/res/values/base-strings.xml
@@ -16,14 +16,13 @@
-->
- Speed Tracker
+ SpeedTracker
+ android:targetSdkVersion="25" />
+
+
diff --git a/samples/browseable/SpeedTracker/Wearable/src/com.example.android.wearable.speedtracker/WearableMainActivity.java b/samples/browseable/SpeedTracker/Wearable/src/com.example.android.wearable.speedtracker/WearableMainActivity.java
index 66550c6c5..20ded86fa 100644
--- a/samples/browseable/SpeedTracker/Wearable/src/com.example.android.wearable.speedtracker/WearableMainActivity.java
+++ b/samples/browseable/SpeedTracker/Wearable/src/com.example.android.wearable.speedtracker/WearableMainActivity.java
@@ -29,6 +29,7 @@ import com.google.android.gms.wearable.PutDataRequest;
import com.google.android.gms.wearable.Wearable;
import android.Manifest;
+import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
@@ -326,6 +327,7 @@ public class WearableMainActivity extends WearableActivity implements
}
}
+ @SuppressLint("MissingPermission")
@Override
public void onConnected(Bundle bundle) {
diff --git a/samples/browseable/SpeedTracker/_index.jd b/samples/browseable/SpeedTracker/_index.jd
index e87095247..398e9d4a0 100644
--- a/samples/browseable/SpeedTracker/_index.jd
+++ b/samples/browseable/SpeedTracker/_index.jd
@@ -1,13 +1,12 @@
-page.tags="Speed Tracker"
+page.tags="SpeedTracker"
sample.group=Wearable
@jd:body
This sample uses the FusedLocation APIs of Google Play Services
-on those devices that have a hardware GPS built in. In those
-cases, this sample provides a simple screen that shows the
+to gather location and speed. The sample provides a simple screen that shows the
current speed of the device on the watch. User can set a speed
limit and if the speed approaches that limit, it changes the
color to yellow and if it exceeds the limit, it turns red. User
diff --git a/samples/browseable/StorageClient/res/menu/main.xml b/samples/browseable/StorageClient/res/menu/main.xml
index 2c3515dd4..498f2c60e 100644
--- a/samples/browseable/StorageClient/res/menu/main.xml
+++ b/samples/browseable/StorageClient/res/menu/main.xml
@@ -14,8 +14,9 @@
limitations under the License.
-->
-