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

Commit 4a012833 authored by Doris Ling's avatar Doris Ling
Browse files

Remove the feature flag for using new title. 

- remove all code that check for the feature flag, and use the new logic
by default.

Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6
Fixes: 64564191
Test: make RunSettingsRoboTests
parent bbdc72c9

src/com/android/settings/DeviceAdminSettings.java

+1 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.widget.Switch; 
import android.widget.TextView;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.instrumentation.Instrumentable;

import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
@@ -137,10 +136,8 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable 
        super.onActivityCreated(savedInstanceState);

        setHasOptionsMenu(true);

        Utils.forceCustomPadding(getListView(), true /* additive padding */);

        if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {

        getActivity().setTitle(R.string.manage_device_admin);

    }

    }



    @Override

    public void onResume() {

src/com/android/settings/MasterClear.java

+1 −3
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ public class MasterClear extends InstrumentedPreferenceFragment { 
    @Override

    public void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (usePreferenceScreenTitle()) {

        getActivity().setTitle(R.string.master_clear_title);

    }

    }



    /**

     * Keyguard validation is run using the standard {@link ConfirmLockPattern}

src/com/android/settings/ResetNetwork.java

+1 −3
Original line number Diff line number Diff line
@@ -68,10 +68,8 @@ public class ResetNetwork extends InstrumentedPreferenceFragment { 
    @Override

    public void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (usePreferenceScreenTitle()) {

        getActivity().setTitle(R.string.reset_network_title);

    }

    }



    /**

     * Keyguard validation is run using the standard {@link ConfirmLockPattern}

src/com/android/settings/ScreenPinningSettings.java

+1 −3
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment 
        super.onActivityCreated(savedInstanceState);



        final SettingsActivity activity = (SettingsActivity) getActivity();

        if (usePreferenceScreenTitle()) {

        activity.setTitle(R.string.screen_pinning_title);

        }

        mLockPatternUtils = new LockPatternUtils(activity);

src/com/android/settings/SettingsActivity.java

+3 −13
Original line number Diff line number Diff line
@@ -209,12 +209,7 @@ public class SettingsActivity extends SettingsDrawerActivity 


    @Override

    public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {

        if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {

        startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, null, null, 0);

        } else {

            startPreferencePanel(caller, pref.getFragment(), pref.getExtras(), -1, pref.getTitle(),

                    null, 0);

        }

        return true;

    }
@@ -631,13 +626,8 @@ public class SettingsActivity extends SettingsDrawerActivity 
    public void startPreferencePanel(Fragment caller, String fragmentClass, Bundle args,

            int titleRes, CharSequence titleText, Fragment resultTo, int resultRequestCode) {

        String title = null;

        if (titleRes < 0) {

            if (titleText != null) {

        if (titleRes < 0 && titleText != null) {

            title = titleText.toString();

            } else if (!InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {

                // There not much we can do in that case

                title = "";

            }

        }

        Utils.startWithFragment(this, fragmentClass, args, resultTo, resultRequestCode,

                titleRes, title, mIsShortcut, mMetricsFeatureProvider.getMetricsCategory(caller));