commit c228b629bbef4ffe72db98907e1884c8648cc0ec
author Yorke Lee <yorkelee@google.com> Mon Sep 09 14:08:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 14:08:04 2013 +0000
tree ccead0eb9d26fd23ab3b603a95c3b68bcc73a66d
parent 676c463dd1ed91272fe177f54fc93990b8e362c4
parent 6219668d0612f7522bd15a9d34c6232cb15b9a6c

Merge "Make quick contact photo clickable" into klp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3ea1dcb..7bbdc60 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -217,7 +217,8 @@
         <activity
             android:name=".preference.ContactsPreferenceActivity"
             android:label="@string/activity_title_settings"
-            android:theme="@style/ContactsPreferencesTheme" />
+            android:theme="@style/ContactsPreferencesTheme"
+            android:exported="false"/>
 
         <!-- Used to filter contacts list by account -->
         <activity

src/com/android/contacts/preference/ContactsPreferenceActivity.java

diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 79557ba..d47cb22 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -75,4 +75,9 @@
         }
         return false;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return true;
+    }
 }