commit d852486e1f072aca8d0d6bb29ff484bac9d15b2e
author Yorke Lee <yorkelee@google.com> Fri Dec 14 12:16:14 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 14 12:16:15 2012 -0800
tree 15e1fbd05b76cfd08c28b11fe07b8324175fdaa0
parent 878b3da3b7cb654b304af6c897c40c4155f4466e
parent b20ff0bdc379307dbc8337240fd35f8193f3100f

Merge "Cleanup People settings UI"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index de55344..64e1b31 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -383,8 +383,8 @@
     <!-- An allowable value for the "sort list by" contact display option  -->
     <string name="display_options_sort_by_family_name">Family name</string>
 
-    <!-- Label of the "view names as" display option -->
-    <string name="display_options_view_names_as">View contact names as</string>
+    <!-- Label of the "view names as" display option [CHAR LIMIT=64]-->
+    <string name="display_options_view_names_as">View contact names</string>
 
     <!-- An allowable value for the "view names as" contact display option  -->
     <string name="display_options_view_given_name_first">Given name first</string>

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index b8ab085..1b663f0 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1499,7 +1499,7 @@
                     intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT,
                             DisplayOptionsPreferenceFragment.class.getName());
                     intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT_TITLE,
-                            R.string.preference_displayOptions);
+                            R.string.activity_title_settings);
                 }
                 startActivity(intent);
                 return true;