Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d7feba authored by Walter Jang's avatar Walter Jang
Browse files

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

This reverts commit 9fa339f5e144332aff808bc519fc86b29a39a8a8.

Change-Id: I1983c90748708588211ba0fd238d78e73ed2f5f1
parent cf5f1004

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

+13 −27
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.Bundle;

import android.preference.ListPreference;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.Preference;
@@ -46,7 +45,19 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment { 
        // Load the preferences from an XML resource

        // Load the preferences from an XML resource

        addPreferencesFromResource(R.xml.preference_display_options);

        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.

        // Set build version of Contacts App.

        final PackageManager manager = getActivity().getPackageManager();

        final PackageManager manager = getActivity().getPackageManager();
@@ -64,31 +75,6 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment { 
        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));

        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

    @Override

    public Context getContext() {

    public Context getContext() {

        return getActivity();

        return getActivity();