Update sample prebuilts for mnc-docs

Synced to //developers/samples/android commit
243feb49e8d1753b746f69ae5519eaace0e50605.

Change-Id: I9255d2ad8f68669d77124b7840184171fb5a801b

Author: tjohns

samples/browseable/AgendaData/Application/src/com.example.android.wearable.agendadata/CalendarQueryService.java

@@ -250,6 +250,11 @@ private static class Event {
         public PutDataMapRequest toPutDataMapRequest(){
             final PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(
                     makeDataItemPath(eventId, begin));
+            /* In most cases (as in this one), you don't need your DataItem appear instantly. By
+            default, delivery of normal DataItems to the Wear network might be delayed in order to
+            improve battery life for user devices. However, if you can't tolerate a delay in the
+            sync of your DataItems, you can mark them as urgent via setUrgent().
+             */
             DataMap data = putDataMapRequest.getDataMap();
             data.putString(DATA_ITEM_URI, putDataMapRequest.getUri().toString());
             data.putLong(ID, id);

samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java

@@ -48,6 +48,7 @@
 import android.os.HandlerThread;
 import android.support.annotation.NonNull;
 import android.support.v13.app.FragmentCompat;
+import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.util.Size;
 import android.util.SparseIntArray;
@@ -269,6 +270,11 @@ public void onImageAvailable(ImageReader reader) {
      */
     private Semaphore mCameraOpenCloseLock = new Semaphore(1);
 
+    /**
+     * Whether the current camera device supports Flash or not.
+     */
+    private boolean mFlashSupported;
+
     /**
      * A {@link CameraCaptureSession.CaptureCallback} that handles events related to JPEG capture.
      */
@@ -568,6 +574,10 @@ private void setUpCameraOutputs(int width, int height) {
                             mPreviewSize.getHeight(), mPreviewSize.getWidth());
                 }
 
+                // Check if the flash is supported.
+                Boolean available = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+                mFlashSupported = available == null ? false : available;
+
                 mCameraId = cameraId;
                 return;
             }
@@ -585,7 +595,7 @@ private void setUpCameraOutputs(int width, int height) {
      * Opens the camera specified by {@link Camera2BasicFragment#mCameraId}.
      */
     private void openCamera(int width, int height) {
-        if (getActivity().checkSelfPermission(Manifest.permission.CAMERA)
+        if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.CAMERA)
                 != PackageManager.PERMISSION_GRANTED) {
             requestCameraPermission();
             return;
@@ -691,8 +701,7 @@ public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
                                 mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
                                         CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
                                 // Flash is automatically enabled when necessary.
-                                mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-                                        CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+                                setAutoFlash(mPreviewRequestBuilder);
 
                                 // Finally, we start displaying the camera preview.
                                 mPreviewRequest = mPreviewRequestBuilder.build();
@@ -808,8 +817,7 @@ private void captureStillPicture() {
             // Use the same AE and AF modes as the preview.
             captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
                     CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-            captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-                    CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+            setAutoFlash(captureBuilder);
 
             // Orientation
             int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
@@ -844,8 +852,7 @@ private void unlockFocus() {
             // Reset the auto-focus trigger
             mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
                     CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
-            mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-                    CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+            setAutoFlash(mPreviewRequestBuilder);
             mCaptureSession.capture(mPreviewRequestBuilder.build(), mCaptureCallback,
                     mBackgroundHandler);
             // After this, the camera will go back to the normal state of preview.
@@ -877,6 +884,13 @@ public void onClick(View view) {
         }
     }
 
+    private void setAutoFlash(CaptureRequest.Builder requestBuilder) {
+        if (mFlashSupported) {
+            requestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+                    CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+        }
+    }
+
     /**
      * Saves a JPEG {@link Image} into the specified {@link File}.
      */

samples/browseable/DataLayer/Application/src/com.example.android.wearable.datalayer/MainActivity.java

@@ -381,7 +381,9 @@ private class DataItemGenerator implements Runnable {
         public void run() {
             PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(COUNT_PATH);
             putDataMapRequest.getDataMap().putInt(COUNT_KEY, count++);
+            putDataMapRequest.setUrgent();
             PutDataRequest request = putDataMapRequest.asPutDataRequest();
+            request.setUrgent();
 
             LOGD(TAG, "Generating DataItem: " + request);
             if (!mGoogleApiClient.isConnected()) {
@@ -442,6 +444,8 @@ private void sendPhoto(Asset asset) {
         dataMap.getDataMap().putAsset(IMAGE_KEY, asset);
         dataMap.getDataMap().putLong("time", new Date().getTime());
         PutDataRequest request = dataMap.asPutDataRequest();
+        request.setUrgent();
+
         Wearable.DataApi.putDataItem(mGoogleApiClient, request)
                 .setResultCallback(new ResultCallback<DataItemResult>() {
                     @Override

samples/browseable/DisplayingBitmaps/res/layout/image_detail_fragment.xml

@@ -20,6 +20,7 @@
     android:layout_height="fill_parent" >
 
     <ProgressBar
+        android:id="@+id/progressbar"
         style="?android:attr/progressBarStyleLarge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

samples/browseable/DisplayingBitmaps/src/com.example.android.displayingbitmaps/ui/ImageDetailFragment.java

@@ -23,6 +23,7 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 
 import com.example.android.displayingbitmaps.R;
 import com.example.android.displayingbitmaps.util.ImageFetcher;
@@ -32,10 +33,11 @@
 /**
  * This fragment will populate the children of the ViewPager from {@link ImageDetailActivity}.
  */
-public class ImageDetailFragment extends Fragment {
+public class ImageDetailFragment extends Fragment implements ImageWorker.OnImageLoadedListener {
     private static final String IMAGE_DATA_EXTRA = "extra_image_data";
     private String mImageUrl;
     private ImageView mImageView;
+    private ProgressBar mProgressBar;
     private ImageFetcher mImageFetcher;
 
     /**
@@ -75,6 +77,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate and locate the main ImageView
         final View v = inflater.inflate(R.layout.image_detail_fragment, container, false);
         mImageView = (ImageView) v.findViewById(R.id.imageView);
+        mProgressBar = (ProgressBar) v.findViewById(R.id.progressbar);
         return v;
     }
 
@@ -86,7 +89,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         // cache can be used over all pages in the ViewPager
         if (ImageDetailActivity.class.isInstance(getActivity())) {
             mImageFetcher = ((ImageDetailActivity) getActivity()).getImageFetcher();
-            mImageFetcher.loadImage(mImageUrl, mImageView);
+            mImageFetcher.loadImage(mImageUrl, mImageView, this);
         }
 
         // Pass clicks on the ImageView to the parent activity to handle
@@ -104,4 +107,11 @@ public void onDestroy() {
             mImageView.setImageDrawable(null);
         }
     }
+
+    @Override
+    public void onImageLoaded(boolean success) {
+        // Set loading spinner to gone once image has loaded. Cloud also show
+        // an error view here if needed.
+        mProgressBar.setVisibility(View.GONE);
+    }
 }

samples/browseable/DisplayingBitmaps/src/com.example.android.displayingbitmaps/util/ImageWorker.java

@@ -71,8 +71,9 @@ protected ImageWorker(Context context) {
      *
      * @param data The URL of the image to download.
      * @param imageView The ImageView to bind the downloaded image to.
+     * @param listener A listener that will be called back once the image has been loaded.
      */
-    public void loadImage(Object data, ImageView imageView) {
+    public void loadImage(Object data, ImageView imageView, OnImageLoadedListener listener) {
         if (data == null) {
             return;
         }
@@ -86,9 +87,12 @@ public void loadImage(Object data, ImageView imageView) {
         if (value != null) {
             // Bitmap found in memory cache
             imageView.setImageDrawable(value);
+            if (listener != null) {
+                listener.onImageLoaded(true);
+            }
         } else if (cancelPotentialWork(data, imageView)) {
             //BEGIN_INCLUDE(execute_background_task)
-            final BitmapWorkerTask task = new BitmapWorkerTask(data, imageView);
+            final BitmapWorkerTask task = new BitmapWorkerTask(data, imageView, listener);
             final AsyncDrawable asyncDrawable =
                     new AsyncDrawable(mResources, mLoadingBitmap, task);
             imageView.setImageDrawable(asyncDrawable);
@@ -101,6 +105,21 @@ public void loadImage(Object data, ImageView imageView) {
         }
     }
 
+    /**
+     * Load an image specified by the data parameter into an ImageView (override
+     * {@link ImageWorker#processBitmap(Object)} to define the processing logic). A memory and
+     * disk cache will be used if an {@link ImageCache} has been added using
+     * {@link ImageWorker#addImageCache(android.support.v4.app.FragmentManager, ImageCache.ImageCacheParams)}. If the
+     * image is found in the memory cache, it is set immediately, otherwise an {@link AsyncTask}
+     * will be created to asynchronously load the bitmap.
+     *
+     * @param data The URL of the image to download.
+     * @param imageView The ImageView to bind the downloaded image to.
+     */
+    public void loadImage(Object data, ImageView imageView) {
+        loadImage(data, imageView, null);
+    }
+
     /**
      * Set placeholder bitmap that shows when the the background thread is running.
      *
@@ -238,10 +257,18 @@ private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
     private class BitmapWorkerTask extends AsyncTask<Void, Void, BitmapDrawable> {
         private Object mData;
         private final WeakReference<ImageView> imageViewReference;
+        private final OnImageLoadedListener mOnImageLoadedListener;
 
         public BitmapWorkerTask(Object data, ImageView imageView) {
             mData = data;
             imageViewReference = new WeakReference<ImageView>(imageView);
+            mOnImageLoadedListener = null;
+        }
+
+        public BitmapWorkerTask(Object data, ImageView imageView, OnImageLoadedListener listener) {
+            mData = data;
+            imageViewReference = new WeakReference<ImageView>(imageView);
+            mOnImageLoadedListener = listener;
         }
 
         /**
@@ -318,6 +345,7 @@ protected BitmapDrawable doInBackground(Void... params) {
         @Override
         protected void onPostExecute(BitmapDrawable value) {
             //BEGIN_INCLUDE(complete_background_work)
+            boolean success = false;
             // if cancel was called on this task or the "exit early" flag is set then we're done
             if (isCancelled() || mExitTasksEarly) {
                 value = null;
@@ -328,8 +356,12 @@ protected void onPostExecute(BitmapDrawable value) {
                 if (BuildConfig.DEBUG) {
                     Log.d(TAG, "onPostExecute - setting bitmap");
                 }
+                success = true;
                 setImageDrawable(imageView, value);
             }
+            if (mOnImageLoadedListener != null) {
+                mOnImageLoadedListener.onImageLoaded(success);
+            }
             //END_INCLUDE(complete_background_work)
         }
 
@@ -357,6 +389,19 @@ private ImageView getAttachedImageView() {
         }
     }
 
+    /**
+     * Interface definition for callback on image loaded successfully.
+     */
+    public interface OnImageLoadedListener {
+
+        /**
+         * Called once the image has been loaded.
+         * @param success True if the image was loaded successfully, false if
+         *                there was an error.
+         */
+        void onImageLoaded(boolean success);
+    }
+
     /**
      * A custom Drawable that will be attached to the imageView while the work is in progress.
      * Contains a reference to the actual worker task, so that it can be stopped if a new binding is

samples/browseable/FindMyPhone/Wearable/src/com.example.android.wearable.findphone/FindPhoneService.java

@@ -100,6 +100,7 @@ protected void onHandleIntent(Intent intent) {
             // when it receives the change.
             PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(PATH_SOUND_ALARM);
             putDataMapRequest.getDataMap().putBoolean(FIELD_ALARM_ON, alarmOn);
+            putDataMapRequest.setUrgent();
             Wearable.DataApi.putDataItem(mGoogleApiClient, putDataMapRequest.asPutDataRequest())
                     .await();
         } else {

samples/browseable/Geofencing/Application/src/com.example.android.wearable.geofencing/GeofenceTransitionsIntentService.java

@@ -89,6 +89,7 @@ protected void onHandleIntent(Intent intent) {
                 final PutDataMapRequest putDataMapRequest =
                         PutDataMapRequest.create(GEOFENCE_DATA_ITEM_PATH);
                 putDataMapRequest.getDataMap().putString(KEY_GEOFENCE_ID, triggeredGeoFenceId);
+                putDataMapRequest.setUrgent();
                 if (mGoogleApiClient.isConnected()) {
                     Wearable.DataApi.putDataItem(
                             mGoogleApiClient, putDataMapRequest.asPutDataRequest()).await();

samples/browseable/Quiz/Application/src/com.example.android.wearable.quiz/MainActivity.java

@@ -248,7 +248,9 @@ public PutDataRequest toPutDataRequest() {
             dataMap.putInt(QUESTION_INDEX, questionIndex);
             dataMap.putStringArray(ANSWERS, answers);
             dataMap.putInt(CORRECT_ANSWER_INDEX, correctAnswerIndex);
-            return request.asPutDataRequest();
+            PutDataRequest putDataRequest = request.asPutDataRequest();
+            putDataRequest.setUrgent();
+            return putDataRequest;
         }
     }
 
@@ -496,7 +498,10 @@ public void onResult(DataApi.DataItemResult dataItemResult) {
                 dataMap.putBoolean(QUESTION_WAS_DELETED, false);
                 if (!mHasQuestionBeenAsked && dataMap.getInt(QUESTION_INDEX) == 0) {
                     // Ask the first question now.
-                    Wearable.DataApi.putDataItem(mGoogleApiClient, request.asPutDataRequest());
+                    PutDataRequest putDataRequest = request.asPutDataRequest();
+                    // Set to high priority in case it isn't already.
+                    putDataRequest.setUrgent();
+                    Wearable.DataApi.putDataItem(mGoogleApiClient, putDataRequest);
                     setHasQuestionBeenAsked(true);
                 } else {
                     // Enqueue future questions.

samples/browseable/Quiz/Wearable/src/com.example.android.wearable.quiz/DeleteQuestionService.java

@@ -76,6 +76,7 @@ public void onHandleIntent(Intent intent) {
         DataMap dataMap = putDataMapRequest.getDataMap();
         dataMap.putBoolean(QUESTION_WAS_DELETED, true);
         PutDataRequest request = putDataMapRequest.asPutDataRequest();
+        request.setUrgent();
         Wearable.DataApi.putDataItem(mGoogleApiClient, request).await();
         mGoogleApiClient.disconnect();
     }