Merge "[Catalyst] Keep activity title in sync with PreferenceFragment" into main (03556af2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/core/InstrumentedPreferenceFragment.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -21,12 +21,8 @@ import static com.android.internal.jank.InteractionJankMonitor.Configuration;

		import android.content.Context;
		import android.os.Bundle;
		import android.text.TextUtils;
		import android.util.Log;

		import androidx.annotation.XmlRes;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		import androidx.preference.TwoStatePreference;
		import androidx.recyclerview.widget.RecyclerView;

		@@ -108,12 +104,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
		}
		}

		@Override
		public void addPreferencesFromResource(@XmlRes int preferencesResId) {
		super.addPreferencesFromResource(preferencesResId);
		updateActivityTitleWithScreenTitle(getPreferenceScreen());
		}

		@Override
		public <T extends Preference> T findPreference(CharSequence key) {
		if (key == null) {
		@@ -147,17 +137,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
		mMetricsFeatureProvider.logClickedPreference(preference, getMetricsCategory());
		}

		protected void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {
		if (screen != null) {
		final CharSequence title = screen.getTitle();
		if (!TextUtils.isEmpty(title)) {
		getActivity().setTitle(title);
		} else {
		Log.w(TAG, "Screen title missing for fragment " + this.getClass().getName());
		}
		}
		}

		private static final class OnScrollListener extends RecyclerView.OnScrollListener {
		private final InteractionJankMonitor mMonitor = InteractionJankMonitor.getInstance();
		private final String mClassName;

src/com/android/settings/dashboard/DashboardFragment.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -415,7 +415,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		removeControllersForHybridMode();
		}
		setPreferenceScreen(screen);
		updateActivityTitleWithScreenTitle(screen);
		} else {
		addPreferencesFromResource(resId);
		screen = getPreferenceScreen();

src/com/android/settings/widget/RadioButtonPickerFragment.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ public abstract class RadioButtonPickerFragment extends SettingsPreferenceFragme
		if (isCatalystEnabled()) {
		PreferenceScreen preferenceScreen = createPreferenceScreen();
		setPreferenceScreen(preferenceScreen);
		updateActivityTitleWithScreenTitle(preferenceScreen);
		} else {
		super.onCreatePreferences(savedInstanceState, rootKey);
		}

tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.settings.core;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		@@ -84,7 +83,6 @@ public class InstrumentedPreferenceFragmentTest {
		mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);

		verify(mFragment).addPreferencesFromResource(R.xml.screen_pinning_settings);
		verify(mActivity, never()).setTitle(any());
		}

		@Test
		@@ -97,7 +95,6 @@ public class InstrumentedPreferenceFragmentTest {
		mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);

		verify(mFragment).addPreferencesFromResource(R.xml.screen_pinning_settings);
		verify(mActivity).setTitle(title);
		}

		public static class InstrumentedPreferenceFragmentTestable