commit f28e8e6e7c9a46567e1dbea40143ff94600a7b32
author Sean Liu <guanxiongliu@google.com> Mon Feb 22 23:33:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 23:33:10 2016 +0000
tree 72c87b32d486ec34a35bfbbae1bf8e61cfc5a92b
parent f62363701d76b1283edeb7305fc19249fc34899c
parent a3101b7961ff20c8ebccef4d1858fb3c78e4b236

Merge "Augmenting touch size for checkbox on quick contact screen" into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f415d88..a2eb1a3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -233,6 +233,12 @@
             android:exported="false"/>
 
         <activity
+            android:name=".common.activity.RequestDesiredPermissionsActivity"
+            android:label="@string/launcherActivityLabel"
+            android:theme="@style/PeopleTheme"
+            android:exported="false"/>
+
+        <activity
             android:name=".common.activity.RequestImportVCardPermissionsActivity"
             android:label="@string/launcherActivityLabel"
             android:theme="@style/PeopleTheme"

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 8ebbb25..5e00bfe 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -108,6 +108,7 @@
 import com.android.contacts.common.Collapser;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactsUtils;
+import com.android.contacts.common.activity.RequestDesiredPermissionsActivity;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
 import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.compat.EventCompat;
@@ -909,7 +910,8 @@
         Trace.beginSection("onCreate()");
         super.onCreate(savedInstanceState);
 
-        if (RequestPermissionsActivity.startPermissionActivity(this)) {
+        if (RequestPermissionsActivity.startPermissionActivity(this) ||
+                RequestDesiredPermissionsActivity.startPermissionActivity(this)) {
             return;
         }