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

Commit e6493181 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove about preference in GoogleContacts" into ub-contactsdialer-h-dev

parents e83e621c ff9a19d4

AndroidManifest_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ 
        <activity android:name=".common.activity.LicenseActivity"

            android:label="@string/activity_title_licenses"

            android:theme="@style/ContactsPreferencesTheme"

            android:exported="false" />

            android:exported="true" />



        <!-- Used to filter contacts list by account -->

        <activity

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

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import com.android.contacts.common.activity.LicenseActivity; 
 */

public class AboutPreferenceFragment extends PreferenceFragment {



    private static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy";

    private static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms";

    public static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy";

    public static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms";



    public static AboutPreferenceFragment newInstance() {

        return new AboutPreferenceFragment();

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

+8 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.contacts.common.model.AccountTypeManager; 
import com.android.contacts.common.model.account.AccountWithDataSet;

import com.android.contacts.common.util.AccountFilterUtil;

import com.android.contacts.common.util.ImplicitIntentsUtil;

import com.android.contactsbind.HelpUtils;



import java.util.List;
@@ -226,7 +227,9 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment 
        }



        final Preference aboutPreference = findPreference(KEY_ABOUT);

        if (aboutPreference != null) {

            aboutPreference.setOnPreferenceClickListener(this);

        }



        final Preference customFilterPreference = findPreference(KEY_CUSTOM_CONTACTS_FILTER);

        if (customFilterPreference != null) {
@@ -263,6 +266,10 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment 
            getPreferenceScreen().removePreference(findPreference(KEY_SORT_ORDER));

        }



        if (HelpUtils.isHelpAndFeedbackAvailable()) {

            getPreferenceScreen().removePreference(findPreference(KEY_ABOUT));

        }



        // Disable display order for CJK locales as well

        if (!resources.getBoolean(R.bool.config_display_order_user_changeable)) {

            getPreferenceScreen().removePreference(findPreference(KEY_DISPLAY_ORDER));