Merge "Done button closes group editor when name is empty."
diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index 66ddbc6..7f8ae03 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -48,6 +48,7 @@
<android.support.v4.view.ViewPager
android:id="@+id/item_list_pager"
android:layout_width="match_parent"
- android:layout_height="156dip" />
+ android:layout_height="156dip"
+ android:background="@color/quickcontact_list_background"/>
</LinearLayout>
</view>
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>
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;