From 8672a5e2efdc38396541990277020295a05e5e5a Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Thu, 16 Jan 2025 10:37:49 +0800
Subject: [PATCH] [Catalyst] Keep activity title in sync with
 PreferenceFragment

Fix: 390135885
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I0a8edbc6fa2a13d653a85ddfe36bd551e09796f8
---
 .../core/InstrumentedPreferenceFragment.java  | 21 -------------------
 .../settings/dashboard/DashboardFragment.java |  1 -
 .../widget/RadioButtonPickerFragment.java     |  1 -
 .../InstrumentedPreferenceFragmentTest.java   |  3 ---
 4 files changed, 26 deletions(-)

diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index ac87ea5abc6..2ec93b6e75e 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -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;
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index c79cc65bbfa..d163bda8d9f 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -415,7 +415,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
                 removeControllersForHybridMode();
             }
             setPreferenceScreen(screen);
-            updateActivityTitleWithScreenTitle(screen);
         } else {
             addPreferencesFromResource(resId);
             screen = getPreferenceScreen();
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 121458c714a..94b59121110 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -89,7 +89,6 @@ public abstract class RadioButtonPickerFragment extends SettingsPreferenceFragme
         if (isCatalystEnabled()) {
             PreferenceScreen preferenceScreen = createPreferenceScreen();
             setPreferenceScreen(preferenceScreen);
-            updateActivityTitleWithScreenTitle(preferenceScreen);
         } else {
             super.onCreatePreferences(savedInstanceState, rootKey);
         }
diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
index 838edc618a3..3af89f46481 100644
--- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
@@ -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