merge in jb-mr2-release history after reset to master
diff --git a/res/layout/user_profile_button.xml b/res/layout/user_profile_button.xml
index 8735f5a..86136da 100644
--- a/res/layout/user_profile_button.xml
+++ b/res/layout/user_profile_button.xml
@@ -19,12 +19,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/contact_browser_list_item_photo_size"
- android:layout_marginLeft="?attr/list_item_padding_left"
- android:layout_marginRight="?attr/list_item_padding_right"
- android:paddingLeft="?attr/list_item_header_text_indent"
+ android:layout_marginStart="?attr/list_item_padding_left"
+ android:layout_marginEnd="?attr/list_item_padding_right"
+ android:paddingStart="?attr/list_item_header_text_indent"
android:background="?android:attr/selectableItemBackground"
android:singleLine="true"
android:text="@string/profile_display_name"
android:ellipsize="end"
- android:gravity="left|center_vertical"
+ android:gravity="start|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/src/com/android/contacts/util/PhonebookCollatorFactory.java b/src/com/android/contacts/util/PhonebookCollatorFactory.java
index 08ce27a..f9847ee 100644
--- a/src/com/android/contacts/util/PhonebookCollatorFactory.java
+++ b/src/com/android/contacts/util/PhonebookCollatorFactory.java
@@ -25,19 +25,6 @@
*/
public final class PhonebookCollatorFactory {
public static final Collator getCollator() {
- final Locale defaultLocale = Locale.getDefault();
- final String defaultLocaleString = defaultLocale.toString();
- // For Japanese we use a special collator that puts japanese characters before foreign
- // ones (this is called a dictionary collator)
- // Warning: This function has to match the behavior in sqlite3_android.cpp (located in
- // the framework)
- final Locale locale;
- if ("ja".equals(defaultLocaleString) || "ja_JP".equals(defaultLocaleString)) {
- locale = new Locale("ja@collation=phonebook");
- } else {
- locale = defaultLocale;
- }
-
- return Collator.getInstance(locale);
+ return Collator.getInstance(Locale.getDefault());
}
}
