Auto-update

Author: google-automerger

.gradle/2.2.1/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Fri May 22 14:58:06 PDT 2015

.gradle/2.2.1/taskArtifacts/cache.properties.lock

@@ -5,7 +5,7 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:1.1.0'
+ classpath 'com.android.tools.build:gradle:1.2.0'
  }
 }
 

.gradle/2.2.1/taskArtifacts/fileHashes.bin

@@ -54,6 +54,10 @@
  * {@link Activity#requestPermissions(String[], int)} and the return value checked in {@link
  * Activity#onRequestPermissionsResult(int, String[], int[])}.
  * <p>
+ * Before requesting permissions, {@link Activity#shouldShowRequestPermissionRationale(String)}
+ * should be called to provide the user with additional context for the use of permissions if they
+ * have been denied previously.
+ * <p>
  * If this sample is executed on a device running a platform version below M, all permissions
  * declared
  * in the Android manifest file are always granted at install time and cannot be requested at run
@@ -102,14 +106,26 @@ public void showCamera(View view) {
  // BEGIN_INCLUDE(camera_permission)
  // Check if the Camera permission is already available.
  if (PermissionUtil.hasSelfPermission(this, Manifest.permission.CAMERA)) {
+ // Camera permissions is already available, show the camera preview.
  Log.i(TAG,
  "CAMERA permission has already been granted. Displaying camera preview.");
- // Camera permissions is already available, show the camera preview.
  showCameraPreview();
  } else {
+ // Camera permission has not been granted.
  Log.i(TAG, "CAMERA permission has NOT been granted. Requesting permission.");
- // Camera permission has not been granted. Request it.
- requestPermissions(new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA);
+
+ // Provide an additional rationale to the user if the permission was not granted
+ // and the user would benefit from additional context for the use of the permission.
+ if (shouldShowRequestPermissionRationale(Manifest.permission.CAMERA)) {
+ Log.i(TAG,
+ "Displaying camera permission rationale to provide additional context.");
+ Toast.makeText(this, R.string.permission_camera_rationale, Toast.LENGTH_SHORT)
+ .show();
+ }
+
+ // Request Camera permission
+ requestPermissions(new String[]{Manifest.permission.CAMERA},
+ REQUEST_CAMERA);
  }
  // END_INCLUDE(camera_permission)
 
@@ -128,7 +144,18 @@ public void showContacts(View v) {
  // Contact permissions have been granted. Show the contacts fragment.
  showContactDetails();
  } else {
+ // Contacts permissions have not been granted.
  Log.i(TAG, "Contact permissions has NOT been granted. Requesting permission.");
+
+ // Provide an additional rationale to the user if the permission was not granted
+ // and the user would benefit from additional context for the use of the permission.
+ if (shouldShowRequestPermissionRationale(Manifest.permission.CAMERA)) {
+ Log.i(TAG,
+ "Displaying contacts permission rationale to provide additional context.");
+ Toast.makeText(this, R.string.permission_contacts_rationale, Toast.LENGTH_SHORT)
+ .show();
+ }
+
  // contact permissions has not been granted (read and write contacts). Request them.
  requestPermissions(PERMISSIONS_CONTACT, REQUEST_CONTACTS);
  }

.gradle/2.2.1/taskArtifacts/fileSnapshots.bin

@@ -61,8 +61,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
  // Open an instance of the first camera and retrieve its info.
  mCamera = getCameraInstance(CAMERA_ID);
- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
- Camera.getCameraInfo(CAMERA_ID, cameraInfo);
+ Camera.CameraInfo cameraInfo = null;
+
+ if (mCamera != null) {
+ // Get camera info only if the camera is available
+ cameraInfo = new Camera.CameraInfo();
+ Camera.getCameraInfo(CAMERA_ID, cameraInfo);
+ }
 
  if (mCamera == null || cameraInfo == null) {
  // Camera is not available, display error message

.gradle/2.2.1/taskArtifacts/outputFileStates.bin

@@ -16,4 +16,6 @@
  <string name="permision_available_camera">Camera Permission has been granted. Preview can now be opened.</string>
  <string name="permision_available_contacts">Contacts Permissions have been granted. Contacts screen can now be opened.</string>
  <string name="permissions_not_granted">Permissions were not granted.</string>
-</resources>
+ <string name="permission_camera_rationale">Camera permission is needed to show the camera preview.</string>
+ <string name="permission_contacts_rationale">Contacts permissions are needed to demonstrate access to the contacts database.</string>
+</resources>