Merge "Adding speakable description for checkbox" into nyc-dev
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"
diff --git a/res/layout/quickcontact_suggestion_contact_item.xml b/res/layout/quickcontact_suggestion_contact_item.xml
index 127dfcc..3e7ed49 100644
--- a/res/layout/quickcontact_suggestion_contact_item.xml
+++ b/res/layout/quickcontact_suggestion_contact_item.xml
@@ -62,8 +62,8 @@
android:id="@+id/suggestion_checkbox"
android:layout_gravity="center_vertical|end"
android:layout_alignParentEnd="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
android:shadowColor="@color/divider_line_color_light"
android:layout_marginEnd="@dimen/quickcontact_suggestion_card_checkbox_right_margin"/>
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 30a65d1..6aac921 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;
@@ -913,7 +914,8 @@
Trace.beginSection("onCreate()");
super.onCreate(savedInstanceState);
- if (RequestPermissionsActivity.startPermissionActivity(this)) {
+ if (RequestPermissionsActivity.startPermissionActivity(this) ||
+ RequestDesiredPermissionsActivity.startPermissionActivity(this)) {
return;
}