commit 20d7feba9ff089465a3d4db0a3472f5b49140f61
author Walter Jang <wjang@google.com> Wed Jan 20 21:42:43 2016 +0000
committer Walter Jang <wjang@google.com> Wed Jan 20 21:42:43 2016 +0000
tree 1222e3b505d86d5b5685ee41839438353138f935
parent cf5f100452d9006b237931b9475f693d757fd940

Revert "Hide sort order and name format prefs for CJK locales"

This reverts commit 9fa339f5e144332aff808bc519fc86b29a39a8a8.

Change-Id: I1983c90748708588211ba0fd238d78e73ed2f5f1

src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java

diff --git a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
index a8d1460..3a5c536 100644
--- a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
@@ -20,7 +20,6 @@
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -46,7 +45,19 @@
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preference_display_options);
 
-        removeUnsupportedPreferences();
+        // Remove "Default account" setting if no writable accounts.
+        final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(getContext());
+        final List<AccountWithDataSet> accounts = accountTypeManager.getAccounts(
+                /* contactWritableOnly */ true);
+        if (accounts.isEmpty()) {
+            final PreferenceScreen preferenceScreen = getPreferenceScreen();
+            preferenceScreen.removePreference((ListPreference) findPreference("accounts"));
+        }
+
+        // STOPSHIP Show this option when 1) metadata sync is enabled and 2) at least one
+        // focus google account.
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removePreference((ListPreference) findPreference("contactMetadata"));
 
         // Set build version of Contacts App.
         final PackageManager manager = getActivity().getPackageManager();
@@ -64,31 +75,6 @@
         licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));
     }
 
-    private void removeUnsupportedPreferences() {
-        // Disable sort order for CJK locales where it is not supported
-        final Resources resources = getResources();
-        if (!resources.getBoolean(R.bool.config_sort_order_user_changeable)) {
-            getPreferenceScreen().removePreference(findPreference("sortOrder"));
-        }
-
-        // Disable display order for CJK locales as well
-        if (!resources.getBoolean(R.bool.config_display_order_user_changeable)) {
-            getPreferenceScreen().removePreference(findPreference("displayOrder"));
-        }
-
-        // Remove the "Default account" setting if there aren't any writable accounts
-        final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(getContext());
-        final List<AccountWithDataSet> accounts = accountTypeManager.getAccounts(
-                /* contactWritableOnly */ true);
-        if (accounts.isEmpty()) {
-            getPreferenceScreen().removePreference(findPreference("accounts"));
-        }
-
-        // STOPSHIP Show this option when 1) metadata sync is enabled
-        // and 2) there is at least one focus google account
-        getPreferenceScreen().removePreference(findPreference("contactMetadata"));
-    }
-
     @Override
     public Context getContext() {
         return getActivity();