Merge "Expose the regional preferences page" into main
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 01d75e8..6e22780 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,5 +1,6 @@
 [Hook Scripts]
-checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .
+# TODO(b/377902600): Re-enable this hook once it is fixed.
+#checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .
 
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
 
diff --git a/aconfig/settings_biometrics_integration_declarations.aconfig b/aconfig/settings_biometrics_integration_declarations.aconfig
index 8168c85..cc756c6 100644
--- a/aconfig/settings_biometrics_integration_declarations.aconfig
+++ b/aconfig/settings_biometrics_integration_declarations.aconfig
@@ -41,3 +41,14 @@
   description: "This flag controls whether the onboarding education settings UX should be enabled"
   bug: "370940762"
 }
+
+flag {
+  name: "biometric_onboarding_education"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the onboarding education settings UX should be enabled"
+  bug: "370940762"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+
diff --git a/res/layout/preference_battery_header_text.xml b/res/layout/preference_battery_header_text.xml
new file mode 100644
index 0000000..72bdbf6
--- /dev/null
+++ b/res/layout/preference_battery_header_text.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+    android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingBottom="16dp">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
+        android:textSize="14sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ffdadf9..2de7e88 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3050,7 +3050,7 @@
     <!-- Dark UI screen footer action text linking to Modes settings. [CHAR LIMIT=NONE] -->
     <string name="dark_ui_modes_footer_action">Modes settings</string>
     <!-- Even Dimmer setting title. Allows device to reduce brightness even further than standard range. [CHAR LIMIT=NONE] -->
-    <string name="even_dimmer_display_title">Even dimmer</string>
+    <string name="even_dimmer_display_title">Extra dim</string>
     <!-- Even Dimmer setting summary. [CHAR LIMIT=NONE] -->
     <string name="even_dimmer_display_summary">Allow device to go dimmer than usual</string>
 
@@ -12304,8 +12304,10 @@
     <string name="satellite_warning_dialog_title">Can’t turn on <xliff:g id="function" example="bluetooth">%1$s</xliff:g></string>
     <!-- Content for satellite warning dialog to avoid user using wifi/bluetooth/airplane mode [CHAR_LIMIT=NONE] -->
     <string name="satellite_warning_dialog_content">To turn on <xliff:g id="function" example="bluetooth">%1$s</xliff:g>, first end the satellite connection</string>
-    <!-- Category title for satellite functions in mobile network settings [CHAR LIMIT=60] -->
+    <!-- Category title for satellite functions with data transmission in mobile network settings [CHAR LIMIT=60] -->
     <string name="category_title_satellite_connectivity">Satellite connectivity</string>
+    <!-- Title for satellite functions with data transmission in mobile network settings [CHAR LIMIT=60] -->
+    <string name="satellite_setting_connectivity">Satellite connectivity</string>
 
 
     <!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index fb20dce..3c1317d 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -206,7 +206,7 @@
 
         <PreferenceCategory
             android:key="telephony_satellite_settings_category_key"
-            android:title="@string/category_title_satellite_connectivity"
+            android:title="@string/satellite_setting_title"
             settings:controller="com.android.settings.network.telephony.SatelliteSettingsPreferenceCategoryController">
 
             <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 794061a..c7cf873 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -25,8 +25,15 @@
         android:key="battery_header"
         android:title="@string/summary_placeholder"
         android:selectable="false"
+        android:paddingBottom="0px"
+        android:persistent="false"
         settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" />
 
+    <com.android.settings.fuelgauge.BatteryHeaderTextPreference
+        android:key="battery_header_text"
+        android:selectable="false"
+        settings:controller="com.android.settings.fuelgauge.BatteryHeaderTextPreferenceController" />
+
     <com.android.settingslib.widget.LayoutPreference
         android:key="battery_help_message"
         android:layout="@layout/preference_battery_error"
diff --git a/src/com/android/settings/EventLogTags.logtags b/src/com/android/settings/EventLogTags.logtags
index 2c8ad35..4e5a742 100644
--- a/src/com/android/settings/EventLogTags.logtags
+++ b/src/com/android/settings/EventLogTags.logtags
@@ -1,4 +1,4 @@
-# See system/core/logcat/event.logtags for a description of the format of this file.
+# See system/logging/logcat/event.logtags for a description of the format of this file.
 
 option java_package com.android.settings
 
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
new file mode 100644
index 0000000..2a9b0e8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge
+
+import android.content.Context
+import androidx.annotation.VisibleForTesting
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT
+import com.android.settingslib.Utils
+import com.android.settingslib.fuelgauge.BatteryUtils
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.preference.PreferenceBinding
+import com.android.settingslib.widget.UsageProgressBarPreference
+
+// LINT.IfChange
+class BatteryHeaderPreference :
+    PreferenceMetadata,
+    PreferenceBinding,
+    PreferenceLifecycleProvider {
+
+    @VisibleForTesting
+    var batteryBroadcastReceiver: BatteryBroadcastReceiver? = null
+
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.summary_placeholder
+
+    override fun createWidget(context: Context) = UsageProgressBarPreference(context)
+
+    override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+        super.bind(preference, metadata)
+        preference.isSelectable = false
+        if (preference is UsageProgressBarPreference) {
+            quickUpdateHeaderPreference(preference)
+        }
+    }
+
+    override fun isIndexable(context: Context) = false
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        super.onCreate(context)
+        batteryBroadcastReceiver = BatteryBroadcastReceiver(context).apply {
+            setBatteryChangedListener {
+                if (it != BATTERY_NOT_PRESENT) {
+                    context.notifyPreferenceChange(KEY)
+                }
+            }
+        }
+    }
+
+    override fun onStart(context: PreferenceLifecycleContext) {
+        super.onStart(context)
+        batteryBroadcastReceiver?.register();
+    }
+
+    override fun onStop(context: PreferenceLifecycleContext) {
+        super.onStop(context)
+        batteryBroadcastReceiver?.unRegister();
+    }
+
+    companion object {
+        private const val KEY = "battery_header"
+        private const val BATTERY_MAX_LEVEL: Long = 100L
+
+        private fun quickUpdateHeaderPreference(preference: UsageProgressBarPreference) {
+            val batteryIntent = BatteryUtils.getBatteryIntent(preference.context) ?: return
+            val batteryLevel: Int = Utils.getBatteryLevel(batteryIntent)
+            preference.apply {
+                setUsageSummary(com.android.settings.Utils.formatPercentage(batteryLevel))
+                setPercent(batteryLevel.toLong(), BATTERY_MAX_LEVEL)
+                setBottomSummary("")
+            }
+        }
+    }
+}
+// LINT.ThenChange(BatteryHeaderPreferenceController.java)
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 891a997..adcd7d1 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2024 The Android Open Source Project
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,59 +16,77 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT;
+
 import android.content.Context;
 import android.content.Intent;
-import android.os.BatteryManager;
-import android.os.PowerManager;
-import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.settingslib.widget.UsageProgressBarPreference;
 
+// LINT.IfChange
 /** Controller that update the battery header view */
 public class BatteryHeaderPreferenceController extends BasePreferenceController
-        implements PreferenceControllerMixin, BatteryPreferenceController {
+        implements PreferenceControllerMixin, LifecycleEventObserver {
     private static final String TAG = "BatteryHeaderPreferenceController";
-
-    @VisibleForTesting static final String KEY_BATTERY_HEADER = "battery_header";
     private static final int BATTERY_MAX_LEVEL = 100;
 
-    @VisibleForTesting BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
-    @VisibleForTesting UsageProgressBarPreference mBatteryUsageProgressBarPref;
-
-    private final PowerManager mPowerManager;
-    private final BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
-
-    private BatteryTip mBatteryTip;
+    @Nullable @VisibleForTesting BatteryBroadcastReceiver mBatteryBroadcastReceiver;
+    @Nullable @VisibleForTesting UsageProgressBarPreference mBatteryUsageProgressBarPreference;
 
     public BatteryHeaderPreferenceController(Context context, String key) {
         super(context, key);
-        mPowerManager = context.getSystemService(PowerManager.class);
-        mBatteryStatusFeatureProvider =
-                FeatureFactory.getFeatureFactory().getBatteryStatusFeatureProvider();
-        mBatterySettingsFeatureProvider =
-                FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
+    }
+
+    @Override
+    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull Lifecycle.Event event) {
+        switch (event) {
+            case ON_CREATE:
+                mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
+                mBatteryBroadcastReceiver.setBatteryChangedListener(
+                        type -> {
+                            if (type != BATTERY_NOT_PRESENT) {
+                                quickUpdateHeaderPreference();
+                            }
+                        });
+                break;
+            case ON_START:
+                if (mBatteryBroadcastReceiver != null) {
+                    mBatteryBroadcastReceiver.register();
+                }
+                break;
+            case ON_STOP:
+                if (mBatteryBroadcastReceiver != null) {
+                    mBatteryBroadcastReceiver.unRegister();
+                }
+                break;
+            default:
+                break;
+        }
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
-        // Set up empty space text first to prevent layout flaky before info loaded.
-        mBatteryUsageProgressBarPref.setBottomSummary(" ");
+        mBatteryUsageProgressBarPreference = screen.findPreference(getPreferenceKey());
+        // Hide the bottom summary from the progress bar.
+        mBatteryUsageProgressBarPreference.setBottomSummary("");
 
         if (com.android.settings.Utils.isBatteryPresent(mContext)) {
             quickUpdateHeaderPreference();
         } else {
-            mBatteryUsageProgressBarPref.setVisible(false);
+            mBatteryUsageProgressBarPreference.setVisible(false);
         }
     }
 
@@ -76,105 +95,23 @@
         return AVAILABLE_UNSEARCHABLE;
     }
 
-    private CharSequence generateLabel(BatteryInfo info) {
-        if (Utils.containsIncompatibleChargers(mContext, TAG)) {
-            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_not_charging);
-        }
-        if (BatteryUtils.isBatteryDefenderOn(info)
-                || FeatureFactory.getFeatureFactory()
-                .getPowerUsageFeatureProvider()
-                .isExtraDefend()) {
-            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_charging_on_hold);
-        }
-        if (info.remainingLabel != null
-                && mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) {
-            return info.remainingLabel;
-        }
-        if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
-            return info.statusLabel;
-        }
-        if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
-            final CharSequence wirelessChargingLabel =
-                    mBatterySettingsFeatureProvider.getWirelessChargingLabel(mContext, info);
-            if (wirelessChargingLabel != null) {
-                mBatteryUsageProgressBarPref.setBottomSummaryContentDescription(
-                        mBatterySettingsFeatureProvider
-                                .getWirelessChargingContentDescription(mContext, info));
-                return wirelessChargingLabel;
-            }
-        }
-        if (info.remainingLabel == null) {
-            return info.statusLabel;
-        }
-        if (info.statusLabel != null && !info.discharging) {
-            // Charging state
-            if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {
-                return info.isFastCharging
-                        ? mContext.getString(
-                                R.string.battery_state_and_duration,
-                                info.statusLabel,
-                                info.remainingLabel)
-                        : info.remainingLabel;
-            }
-            return mContext.getString(
-                    R.string.battery_state_and_duration, info.statusLabel, info.remainingLabel);
-        } else if (mPowerManager.isPowerSaveMode()) {
-            // Power save mode is on
-            final String powerSaverOn =
-                    mContext.getString(R.string.battery_tip_early_heads_up_done_title);
-            return mContext.getString(
-                    R.string.battery_state_and_duration, powerSaverOn, info.remainingLabel);
-        } else if (mBatteryTip != null && mBatteryTip.getType() == BatteryTip.TipType.LOW_BATTERY) {
-            // Low battery state
-            final String lowBattery = mContext.getString(R.string.low_battery_summary);
-            return mContext.getString(
-                    R.string.battery_state_and_duration, lowBattery, info.remainingLabel);
-        } else {
-            // Discharging state
-            return info.remainingLabel;
-        }
-    }
-
-    public void updateHeaderPreference(BatteryInfo info) {
-        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
-            mBatteryUsageProgressBarPref.setBottomSummary(generateLabel(info));
-        }
-
-        mBatteryUsageProgressBarPref.setUsageSummary(
-                formatBatteryPercentageText(info.batteryLevel));
-        mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
-    }
-
-    /** Callback which receives text for the summary line. */
-    public void updateBatteryStatus(String label, BatteryInfo info) {
-        final CharSequence summary = label != null ? label : generateLabel(info);
-        mBatteryUsageProgressBarPref.setBottomSummary(summary);
-        Log.d(TAG, "updateBatteryStatus: " + label + " summary: " + summary);
-    }
-
+    /** Updates {@link UsageProgressBarPreference} information. */
     public void quickUpdateHeaderPreference() {
+        if (mBatteryUsageProgressBarPreference == null) {
+            return;
+        }
+
         Intent batteryBroadcast =
                 com.android.settingslib.fuelgauge.BatteryUtils.getBatteryIntent(mContext);
         final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
-        final boolean discharging =
-                batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
 
-        mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
-        mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
-    }
-
-    /** Update summary when battery tips changed. */
-    public void updateHeaderByBatteryTips(BatteryTip batteryTip, BatteryInfo batteryInfo) {
-        mBatteryTip = batteryTip;
-
-        if (mBatteryTip != null && batteryInfo != null) {
-            updateHeaderPreference(batteryInfo);
-        }
+        mBatteryUsageProgressBarPreference.setUsageSummary(
+                formatBatteryPercentageText(batteryLevel));
+        mBatteryUsageProgressBarPreference.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
     }
 
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
         return com.android.settings.Utils.formatPercentage(batteryLevel);
     }
 }
+// LINT.ThenChange(BatteryHeaderPreference.kt)
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
new file mode 100644
index 0000000..5c81277
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+/** A preference for battery header text. */
+public class BatteryHeaderTextPreference extends Preference {
+    private static final String TAG = "BatteryHeaderTextPreference";
+
+    @Nullable private CharSequence mText;
+    @Nullable private CharSequence mContentDescription;
+
+    public BatteryHeaderTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.preference_battery_header_text);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        final TextView textView = (TextView) view.findViewById(R.id.text);
+        textView.setText(mText);
+        if (!TextUtils.isEmpty(mContentDescription)) {
+            textView.setContentDescription(mContentDescription);
+        }
+    }
+
+    void setText(@Nullable CharSequence text) {
+        mText = text;
+        notifyChanged();
+    }
+
+    void setContentDescription(@Nullable CharSequence contentDescription) {
+        mContentDescription = contentDescription;
+        notifyChanged();
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java
index a7e1254..b609174 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceController.java
@@ -17,11 +17,12 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
@@ -31,23 +32,20 @@
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
-import com.android.settingslib.widget.UsageProgressBarPreference;
 
 /** Controller that update the battery header view */
 public class BatteryHeaderTextPreferenceController extends BasePreferenceController
         implements PreferenceControllerMixin, BatteryPreferenceController {
-    private static final String TAG = "BatteryHeaderPreferenceController";
-
-    @VisibleForTesting static final String KEY_BATTERY_HEADER = "battery_header";
-    private static final int BATTERY_MAX_LEVEL = 100;
-
-    @VisibleForTesting BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
-    @VisibleForTesting UsageProgressBarPreference mBatteryUsageProgressBarPref;
+    private static final String TAG = "BatteryHeaderTextPreferenceController";
 
     private final PowerManager mPowerManager;
     private final BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
 
-    private BatteryTip mBatteryTip;
+    @Nullable private BatteryTip mBatteryTip;
+
+    @VisibleForTesting BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+
+    @Nullable @VisibleForTesting BatteryHeaderTextPreference mBatteryHeaderTextPreference;
 
     public BatteryHeaderTextPreferenceController(Context context, String key) {
         super(context, key);
@@ -61,14 +59,11 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
-        // Set up empty space text first to prevent layout flaky before info loaded.
-        mBatteryUsageProgressBarPref.setBottomSummary(" ");
+        mBatteryHeaderTextPreference = screen.findPreference(getPreferenceKey());
 
-        if (com.android.settings.Utils.isBatteryPresent(mContext)) {
-            quickUpdateHeaderPreference();
-        } else {
-            mBatteryUsageProgressBarPref.setVisible(false);
+        if (mBatteryHeaderTextPreference != null
+                && !com.android.settings.Utils.isBatteryPresent(mContext)) {
+            mBatteryHeaderTextPreference.setVisible(false);
         }
     }
 
@@ -77,7 +72,8 @@
         return AVAILABLE_UNSEARCHABLE;
     }
 
-    private CharSequence generateLabel(BatteryInfo info) {
+    @NonNull
+    private CharSequence generateLabel(@NonNull BatteryInfo info) {
         if (Utils.containsIncompatibleChargers(mContext, TAG)) {
             return mContext.getString(
                     com.android.settingslib.R.string.battery_info_status_not_charging);
@@ -99,8 +95,8 @@
         if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
             final CharSequence wirelessChargingLabel =
                     mBatterySettingsFeatureProvider.getWirelessChargingLabel(mContext, info);
-            if (wirelessChargingLabel != null) {
-                mBatteryUsageProgressBarPref.setBottomSummaryContentDescription(
+            if (mBatteryHeaderTextPreference != null && wirelessChargingLabel != null) {
+                mBatteryHeaderTextPreference.setContentDescription(
                         mBatterySettingsFeatureProvider
                                 .getWirelessChargingContentDescription(mContext, info));
                 return wirelessChargingLabel;
@@ -138,46 +134,33 @@
         }
     }
 
-    /** Updates the battery header. */
-    public void updateHeaderPreference(BatteryInfo info) {
-        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
-            mBatteryUsageProgressBarPref.setBottomSummary(generateLabel(info));
+    /** Updates the battery header text with the given BatteryInfo. */
+    public void updateHeaderPreference(@NonNull BatteryInfo info) {
+        if (mBatteryHeaderTextPreference != null
+                && !mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+            mBatteryHeaderTextPreference.setText(generateLabel(info));
         }
-
-        mBatteryUsageProgressBarPref.setUsageSummary(
-                formatBatteryPercentageText(info.batteryLevel));
-        mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
     }
 
-    /** Callback which receives text for the summary line. */
+    /** Callback which updates the battery header text with the given label. */
+    @Override
     public void updateBatteryStatus(String label, BatteryInfo info) {
+        if (mBatteryHeaderTextPreference == null) {
+            return;
+        }
+
         final CharSequence summary = label != null ? label : generateLabel(info);
-        mBatteryUsageProgressBarPref.setBottomSummary(summary);
+        mBatteryHeaderTextPreference.setText(summary);
         Log.d(TAG, "updateBatteryStatus: " + label + " summary: " + summary);
     }
 
-    /** Updates the battery header quickly. */
-    public void quickUpdateHeaderPreference() {
-        Intent batteryBroadcast =
-                com.android.settingslib.fuelgauge.BatteryUtils.getBatteryIntent(mContext);
-        final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
-        final boolean discharging =
-                batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
-
-        mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
-        mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
-    }
-
-    /** Update summary when battery tips changed. */
-    public void updateHeaderByBatteryTips(BatteryTip batteryTip, BatteryInfo batteryInfo) {
+    /** Update summary when battery tips are changed. */
+    public void updateHeaderByBatteryTips(
+            @Nullable BatteryTip batteryTip, @NonNull BatteryInfo batteryInfo) {
         mBatteryTip = batteryTip;
 
         if (mBatteryTip != null && batteryInfo != null) {
             updateHeaderPreference(batteryInfo);
         }
     }
-
-    private CharSequence formatBatteryPercentageText(int batteryLevel) {
-        return com.android.settings.Utils.formatPercentage(batteryLevel);
-    }
 }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
index b5581d0..66c2ee9 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java
@@ -36,7 +36,7 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.fuelgauge.BatteryHeaderPreferenceController;
+import com.android.settings.fuelgauge.BatteryHeaderTextPreferenceController;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryInfoLoader;
 import com.android.settings.fuelgauge.BatteryUtils;
@@ -67,7 +67,7 @@
     @VisibleForTesting BatteryUtils mBatteryUtils;
     @VisibleForTesting BatteryInfo mBatteryInfo;
 
-    @VisibleForTesting BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
+    @VisibleForTesting BatteryHeaderTextPreferenceController mBatteryHeaderTextPreferenceController;
     @VisibleForTesting BatteryTipPreferenceController mBatteryTipPreferenceController;
     @VisibleForTesting boolean mNeedUpdateBatteryTip;
     @VisibleForTesting Preference mHelpPreference;
@@ -93,8 +93,8 @@
 
                 @Override
                 public void onLoadFinished(Loader<BatteryInfo> loader, BatteryInfo batteryInfo) {
-                    mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
-                    mBatteryHeaderPreferenceController.updateHeaderByBatteryTips(
+                    mBatteryHeaderTextPreferenceController.updateHeaderPreference(batteryInfo);
+                    mBatteryHeaderTextPreferenceController.updateHeaderByBatteryTips(
                             mBatteryTipPreferenceController.getCurrentBatteryTip(), batteryInfo);
                     mBatteryInfo = batteryInfo;
                 }
@@ -116,7 +116,7 @@
                 @Override
                 public void onLoadFinished(Loader<List<BatteryTip>> loader, List<BatteryTip> data) {
                     mBatteryTipPreferenceController.updateBatteryTips(data);
-                    mBatteryHeaderPreferenceController.updateHeaderByBatteryTips(
+                    mBatteryHeaderTextPreferenceController.updateHeaderByBatteryTips(
                             mBatteryTipPreferenceController.getCurrentBatteryTip(), mBatteryInfo);
                 }
 
@@ -129,7 +129,7 @@
         super.onAttach(context);
         final Activity activity = getActivity();
 
-        mBatteryHeaderPreferenceController = use(BatteryHeaderPreferenceController.class);
+        mBatteryHeaderTextPreferenceController = use(BatteryHeaderTextPreferenceController.class);
 
         mBatteryTipPreferenceController = use(BatteryTipPreferenceController.class);
         mBatteryTipPreferenceController.setActivity(activity);
@@ -251,15 +251,6 @@
     }
 
     @Override
-    protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
-        super.restartBatteryStatsLoader(refreshType);
-        // Update battery header if battery is present.
-        if (mIsBatteryPresent) {
-            mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
-        }
-    }
-
-    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         mBatteryTipPreferenceController.saveInstanceState(outState);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
index b397bf3..9ff46b9 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt
@@ -19,6 +19,7 @@
 import com.android.settings.R
 import com.android.settings.display.BatteryPercentageSwitchPreference
 import com.android.settings.flags.Flags
+import com.android.settings.fuelgauge.BatteryHeaderPreference
 import com.android.settingslib.metadata.PreferenceAvailabilityProvider
 import com.android.settingslib.metadata.PreferenceIconProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -53,8 +54,10 @@
             R.drawable.ic_settings_battery_white
         }
 
-    override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) { +BatteryPercentageSwitchPreference() }
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+        +BatteryHeaderPreference()
+        +BatteryPercentageSwitchPreference()
+    }
 
     companion object {
         const val KEY = "power_usage_summary_screen"
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index 9ca0294..efdd9cb 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -86,6 +86,7 @@
     @Override
     public void displayPreference(@NonNull PreferenceScreen screen) {
         super.displayPreference(screen);
+        updateState(screen.findPreference(getPreferenceKey()));
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
index 951d9ca..688e7b4 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
@@ -16,55 +16,120 @@
 
 package com.android.settings.network.telephony;
 
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
+
 import android.content.Context;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.satellite.SatelliteManager;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.telephony.satellite.NtnSignalStrength;
 import android.util.Log;
 
-import com.android.internal.telephony.flags.Flags;
-import com.android.settings.network.CarrierConfigCache;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
 
-/** Preference controller for Satellite functions in mobile network settings.*/
+import com.android.settings.R;
+
+import java.util.List;
+
+/** Preference controller for Satellite functions in mobile network settings. */
 public class SatelliteSettingsPreferenceCategoryController
-        extends TelephonyBasePreferenceController {
+        extends TelephonyBasePreferenceController implements DefaultLifecycleObserver {
     private static final String TAG = "SatelliteSettingsPrefCategoryCon";
 
-    private CarrierConfigCache mCarrierConfigCache;
-    private SatelliteManager mSatelliteManager;
+    private PreferenceCategory mPreferenceCategory;
+    private TelephonyManager mTelephonyManager = null;
+
+    @VisibleForTesting
+    final CarrierRoamingNtnModeCallback mCarrierRoamingNtnModeCallback =
+            new CarrierRoamingNtnModeCallback();
 
     public SatelliteSettingsPreferenceCategoryController(Context context, String key) {
         super(context, key);
-        mCarrierConfigCache = CarrierConfigCache.getInstance(context);
-        mSatelliteManager = context.getSystemService(SatelliteManager.class);
+        setAvailabilityStatus(UNSUPPORTED_ON_DEVICE);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
     }
 
     /**
      * Set subId for Satellite Settings category .
+     *
      * @param subId subscription ID.
      */
     public void init(int subId) {
         Log.d(TAG, "init(), subId=" + subId);
         mSubId = subId;
+        mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceCategory = screen.findPreference(getPreferenceKey());
+        if (mPreferenceCategory.getPreferenceCount() > 0) {
+            for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) {
+                if (mPreferenceCategory.getPreference(i).isVisible()) {
+                    setAvailabilityStatus(AVAILABLE_UNSEARCHABLE);
+                    break;
+                }
+            }
+        }
     }
 
     @Override
     public int getAvailabilityStatus(int subId) {
-        if (!Flags.carrierEnabledSatelliteFlag()) {
-            Log.d(TAG, "getAvailabilityStatus(" + subId + ") : carrierEnabledSatelliteFlag "
-                    + "is disabled");
-            return UNSUPPORTED_ON_DEVICE;
+        return isAvailable() ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public void onResume(@NonNull LifecycleOwner owner) {
+        mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(),
+                mCarrierRoamingNtnModeCallback);
+    }
+
+    @Override
+    public void onPause(@NonNull LifecycleOwner owner) {
+        mTelephonyManager.unregisterTelephonyCallback(mCarrierRoamingNtnModeCallback);
+    }
+
+    @VisibleForTesting
+    class CarrierRoamingNtnModeCallback extends TelephonyCallback implements
+            TelephonyCallback.CarrierRoamingNtnModeListener {
+        @Override
+        public void onCarrierRoamingNtnAvailableServicesChanged(List<Integer> availableServices) {
+            CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged(
+                    availableServices);
+            boolean isSmsAvailable = availableServices.contains(SERVICE_TYPE_SMS);
+            boolean isDataAvailable = availableServices.contains(SERVICE_TYPE_DATA);
+            Log.i(TAG, "isSmsAvailable : " + isSmsAvailable
+                    + " / isDataAvailable " + isDataAvailable);
+            if (mPreferenceCategory == null) {
+                Log.d(TAG, "Satellite preference category is not initialized yet");
+                return;
+            }
+            if (isDataAvailable) {
+                mPreferenceCategory.setTitle(R.string.category_title_satellite_connectivity);
+            } else if (isSmsAvailable) {
+                mPreferenceCategory.setTitle(R.string.satellite_setting_title);
+            }
         }
 
-        if (mSatelliteManager == null) {
-            Log.d(TAG, "getAvailabilityStatus(" + subId + ") : SatelliteManager is null");
-            return UNSUPPORTED_ON_DEVICE;
+        @Override
+        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {
+            // Do nothing
         }
 
-        final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
-        final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(
-                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);
+        @Override
+        public void onCarrierRoamingNtnModeChanged(boolean active) {
+            // Do nothing
+        }
 
-        return isSatelliteAttachSupported ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        @Override
+        public void onCarrierRoamingNtnSignalStrengthChanged(NtnSignalStrength ntnSignalStrength) {
+            // Do nothing
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index fdb075d..44d386f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,31 +17,21 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.usb.UsbManager;
-import android.hardware.usb.UsbPort;
-import android.hardware.usb.UsbPortStatus;
 import android.os.BatteryManager;
-import android.os.PowerManager;
-import android.os.SystemProperties;
 
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
-import com.android.settings.fuelgauge.batterytip.tips.SmartBatteryTip;
-import com.android.settings.testutils.BatteryTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.widget.EntityHeaderController;
@@ -56,10 +46,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPowerManager;
 
+// LINT.IfChange
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
 public class BatteryHeaderPreferenceControllerTest {
@@ -67,23 +56,17 @@
     private static final String PREF_KEY = "battery_header";
     private static final int BATTERY_LEVEL = 60;
     private static final int BATTERY_MAX_LEVEL = 100;
-    private static final String TIME_LEFT = "2h30min";
-    private static final String BATTERY_STATUS = "Charging";
 
     @Mock private PreferenceScreen mPreferenceScreen;
-    @Mock private BatteryInfo mBatteryInfo;
+    @Mock private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
     @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private UsageProgressBarPreference mBatteryUsageProgressBarPref;
-    @Mock private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
-    @Mock private UsbPort mUsbPort;
+    @Mock private UsageProgressBarPreference mBatteryUsageProgressBarPreference;
     @Mock private UsbManager mUsbManager;
-    @Mock private UsbPortStatus mUsbPortStatus;
+    @Mock private LifecycleOwner mLifecycleOwner;
 
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
-    private ShadowPowerManager mShadowPowerManager;
     private Intent mBatteryIntent;
-    private FakeFeatureFactory mFactory;
 
     @Before
     public void setUp() {
@@ -99,18 +82,12 @@
         mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
         doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
 
-        doReturn(mBatteryUsageProgressBarPref)
+        doReturn(mBatteryUsageProgressBarPreference)
                 .when(mPreferenceScreen)
-                .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
-
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
-
-        mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
-        mFactory = FakeFeatureFactory.setupForTest();
+                .findPreference(PREF_KEY);
 
         mController = spy(new BatteryHeaderPreferenceController(mContext, PREF_KEY));
-        mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
-        mController.mBatteryStatusFeatureProvider = mBatteryStatusFeatureProvider;
+        mController.mBatteryUsageProgressBarPreference = mBatteryUsageProgressBarPreference;
 
         BatteryUtils.setChargingStringV2Enabled(null);
     }
@@ -122,382 +99,44 @@
     }
 
     @Test
+    public void onStateChanged_onCreate_receiverCreated() {
+        mController.onStateChanged(mLifecycleOwner,  Lifecycle.Event.ON_CREATE);
+
+        assertThat(mController.mBatteryBroadcastReceiver).isNotNull();
+    }
+
+    @Test
+    public void onStateChanged_onStart_receiverRegistered() {
+        mController.mBatteryBroadcastReceiver = mBatteryBroadcastReceiver;
+
+        mController.onStateChanged(mLifecycleOwner,  Lifecycle.Event.ON_START);
+
+        verify(mBatteryBroadcastReceiver).register();
+    }
+
+    @Test
+    public void onStateChanged_onStop_receiverUnregistered() {
+        mController.mBatteryBroadcastReceiver = mBatteryBroadcastReceiver;
+
+        mController.onStateChanged(mLifecycleOwner,  Lifecycle.Event.ON_STOP);
+
+        verify(mBatteryBroadcastReceiver).unRegister();
+    }
+
+    @Test
     public void displayPreference_displayBatteryLevel() {
         mController.displayPreference(mPreferenceScreen);
 
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updatePreference_hasRemainingTime_showRemainingLabel() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void updatePreference_updateBatteryInfo() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updatePreference_noRemainingTime_showStatusLabel() {
-        mBatteryInfo.remainingLabel = null;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
-    }
-
-    @Test
-    public void updatePreference_statusAnomalous_showStatusLabel() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-        mBatteryInfo.batteryStatus = BatteryManager.BATTERY_STATUS_NOT_CHARGING;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
-    }
-
-    @Test
-    public void updatePreference_charging_showFullText() {
-        setChargingState(/* isDischarging */ false, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        final String expectedResult = BATTERY_STATUS + " • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updatePreference_powerSaverOn_showPowerSaverOn() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-        mShadowPowerManager.setIsPowerSaveMode(true);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        final String expectedResult = "Battery Saver on • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updatePreference_triggerBatteryStatusUpdateTrue_updatePercentageAndUsageOnly() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ true);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updatePreference_triggerBatteryStatusUpdateFalse_updateBatteryInfo() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
-    public void updateBatteryStatus_nullLabel_updateSummaryOnly() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateBatteryStatus(null, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void updateBatteryStatus_withLabel_showLabelText() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        final String label = "Update by battery status • " + TIME_LEFT;
-        mController.updateBatteryStatus(label, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingString_statusWithRemainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "1 hr, 40 min left until full",
-                        /* statusLabel= */ "Charging rapidly",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ false);
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingStringV2FastCharging_statusWithRemainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingStringV2NonFastCharging_remainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Fully charged by 11:10 PM",
-                        /* statusLabel= */ "Charging",
-                        /* isFastCharging= */ false,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_customizedWirelessChargingLabel_customizedLabel() {
-        var label = "Customized Wireless Charging Label";
-        var contentDescription = "Customized Wireless Charging description";
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
-        when(mFactory.batterySettingsFeatureProvider.getWirelessChargingLabel(
-                        eq(mContext), any(BatteryInfo.class)))
-                .thenReturn(label);
-        when(mFactory.batterySettingsFeatureProvider.getWirelessChargingContentDescription(
-                        eq(mContext), any(BatteryInfo.class)))
-                .thenReturn(contentDescription);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
-        verify(mBatteryUsageProgressBarPref).setBottomSummaryContentDescription(contentDescription);
-    }
-
-    @Test
-    public void updateBatteryStatus_noCustomizedWirelessChargingLabel_statusWithRemainingLabel() {
-        var contentDescription = "Customized Wireless Charging description";
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-        verify(mBatteryUsageProgressBarPref, never())
-                .setBottomSummaryContentDescription(contentDescription);
-    }
-
-    @Test
-    public void updateBatteryStatus_noCustomizedWirelessChargingLabel_v1StatusWithRemainingLabel() {
-        var contentDescription = "Customized Wireless Charging description";
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "1 hr, 40 min left until full",
-                        /* statusLabel= */ "Charging wirelessly",
-                        /* isFastCharging= */ false,
-                        /* isChargingStringV2= */ false);
-        batteryInfo.pluggedStatus = BatteryManager.BATTERY_PLUGGED_WIRELESS;
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-        verify(mBatteryUsageProgressBarPref, never())
-                .setBottomSummaryContentDescription(contentDescription);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingOptimizationMode_remainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Expected remaining label",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.remainingLabel;
-        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
-                .thenReturn(true);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_chargingOptimizationModeNoRemainingLabel_statusLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ null,
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.statusLabel;
-        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
-                .thenReturn(true);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_notChargingOptimizationMode_statusWithRemainingLabel() {
-        var batteryInfo =
-                arrangeUpdateBatteryStatusTestWithRemainingLabel(
-                        /* remainingLabel= */ "Full by 1:30 PM",
-                        /* statusLabel= */ "Fast Charging",
-                        /* isFastCharging= */ true,
-                        /* isChargingStringV2= */ true);
-        var expectedChargingString = batteryInfo.statusLabel + " • " + batteryInfo.remainingLabel;
-        when(mFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
-                .thenReturn(false);
-
-        mController.updateBatteryStatus(/* label= */ null, batteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-    }
-
-    @Test
-    public void updateBatteryStatus_dockDefend_chargingOnHold() {
-        var expected = "Charging on hold";
-        mBatteryInfo.isBatteryDefender = false;
-        when(mFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(true);
-
-        mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expected);
-    }
-
-    @Test
-    public void updateBatteryStatus_batteryDefender_chargingOnHold() {
-        var expected = "Charging on hold";
-        mBatteryInfo.isBatteryDefender = true;
-        when(mFactory.powerUsageFeatureProvider.isExtraDefend()).thenReturn(false);
-
-        mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expected);
-    }
-
-    private BatteryInfo arrangeUpdateBatteryStatusTestWithRemainingLabel(
-            String remainingLabel,
-            String statusLabel,
-            boolean isFastCharging,
-            boolean isChargingStringV2) {
-        SystemProperties.set(
-                BatteryUtils.PROPERTY_CHARGING_STRING_V2_KEY, String.valueOf(isChargingStringV2));
-        mBatteryInfo.isBatteryDefender = false;
-        mBatteryInfo.remainingLabel = remainingLabel;
-        mBatteryInfo.statusLabel = statusLabel;
-        mBatteryInfo.discharging = false;
-        mBatteryInfo.isFastCharging = isFastCharging;
-        return mBatteryInfo;
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_lowBatteryTip_showLowBattery() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-        BatteryTip lowBatteryTip =
-                new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
-
-        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
-
-        final String expectedResult = "Low battery • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_notLowBatteryTip_showRemainingLabel() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-        BatteryTip lowBatteryTip = new SmartBatteryTip(BatteryTip.StateType.NEW);
-
-        mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_noTip_noAction() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ false);
-
-        mController.updateHeaderByBatteryTips(null, mBatteryInfo);
-
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
-    }
-
-    @Test
-    public void updateHeaderByBatteryTips_noBatteryInfo_noAction() {
-        BatteryTip lowBatteryTip =
-                new LowBatteryTip(BatteryTip.StateType.NEW, /* powerSaveModeOn */ false);
-
-        mController.updateHeaderByBatteryTips(lowBatteryTip, null);
-
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
-    }
-
-    @Test
-    public void updatePreference_isBatteryDefender_showEmptyText() {
-        mBatteryInfo.isBatteryDefender = true;
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref)
-                .setBottomSummary(
-                        mContext.getString(
-                                com.android.settingslib.R.string
-                                        .battery_info_status_charging_on_hold));
-    }
-
-    @Test
-    public void updatePreference_incompatibleCharger_showNotChargingState() {
-        BatteryTestUtils.setupIncompatibleEvent(mUsbPort, mUsbManager, mUsbPortStatus);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref)
-                .setBottomSummary(
-                        mContext.getString(
-                                com.android.settingslib.R.string.battery_info_status_not_charging));
+        verify(mBatteryUsageProgressBarPreference).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPreference).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
     public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
         mController.quickUpdateHeaderPreference();
 
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+        verify(mBatteryUsageProgressBarPreference).setUsageSummary(formatBatteryPercentageText());
+        verify(mBatteryUsageProgressBarPreference).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
     }
 
     @Test
@@ -512,26 +151,18 @@
 
         mController.displayPreference(mPreferenceScreen);
 
-        assertThat(mBatteryUsageProgressBarPref.isVisible()).isFalse();
+        assertThat(mBatteryUsageProgressBarPreference.isVisible()).isFalse();
     }
 
     @Test
-    public void displayPreference_init_showEmptySpace() {
+    public void displayPreference_init_setEmptyBottomSummary() {
         mController.displayPreference(mPreferenceScreen);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(" ");
+        verify(mBatteryUsageProgressBarPreference).setBottomSummary("");
     }
 
     private CharSequence formatBatteryPercentageText() {
         return com.android.settings.Utils.formatPercentage(BATTERY_LEVEL);
     }
-
-    private void setChargingState(boolean isDischarging, boolean updatedByStatusFeature) {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.statusLabel = BATTERY_STATUS;
-        mBatteryInfo.discharging = isDischarging;
-
-        when(mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(mController, mBatteryInfo))
-                .thenReturn(updatedByStatusFeature);
-    }
 }
+// LINT.ThenChange(BatteryHeaderPreferenceTest.java)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceTest.kt b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceTest.kt
new file mode 100644
index 0000000..27e14c8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceTest.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager.EXTRA_LEVEL
+import android.os.BatteryManager.EXTRA_SCALE
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.preference.createAndBindWidget
+import com.android.settingslib.widget.UsageProgressBarPreference
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class BatteryHeaderPreferenceTest {
+    private val mockLifecycleContext = mock<PreferenceLifecycleContext>()
+    private val mockBatteryBroadcastReceiver = mock<BatteryBroadcastReceiver>()
+    private val batteryHeaderPreference = BatteryHeaderPreference()
+
+    private val context: Context =
+        object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
+            override fun registerReceiver(receiver: BroadcastReceiver?, filter: IntentFilter?) =
+                Intent(Intent.ACTION_BATTERY_CHANGED)
+                    .putExtra(EXTRA_LEVEL, 60)
+                    .putExtra(EXTRA_SCALE, 100)
+        }
+
+    @Test
+    fun createAndBindWidget_selectableIsFalse() {
+        val usageProgressBarPreference =
+            batteryHeaderPreference.createAndBindWidget<UsageProgressBarPreference>(context)
+
+        assertThat(usageProgressBarPreference.isSelectable).isFalse()
+    }
+
+    @Test
+    fun onCreate_createBatteryBroadcastReceiver() {
+        batteryHeaderPreference.onCreate(mockLifecycleContext)
+
+        assertThat(batteryHeaderPreference.batteryBroadcastReceiver).isNotNull()
+    }
+
+    @Test
+    fun onStart_invokeRegisterMethod() {
+        batteryHeaderPreference.batteryBroadcastReceiver = mockBatteryBroadcastReceiver
+
+        batteryHeaderPreference.onStart(mockLifecycleContext)
+
+        verify(mockBatteryBroadcastReceiver).register()
+    }
+
+    @Test
+    fun onStop_invokeUnRegisterMethod() {
+        batteryHeaderPreference.batteryBroadcastReceiver = mockBatteryBroadcastReceiver
+
+        batteryHeaderPreference.onStop(mockLifecycleContext)
+
+        verify(mockBatteryBroadcastReceiver).unRegister()
+    }
+}
+// LINT.ThenChange(BatteryHeaderPreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java
index 1c5ffc8..18fb90d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderTextPreferenceControllerTest.java
@@ -47,7 +47,6 @@
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.fuelgauge.BatteryUtils;
-import com.android.settingslib.widget.UsageProgressBarPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -65,22 +64,21 @@
 @Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
 public class BatteryHeaderTextPreferenceControllerTest {
 
-    private static final String PREF_KEY = "battery_header";
+    private static final String PREF_KEY = "battery_header_text";
     private static final int BATTERY_LEVEL = 60;
-    private static final int BATTERY_MAX_LEVEL = 100;
     private static final String TIME_LEFT = "2h30min";
     private static final String BATTERY_STATUS = "Charging";
 
     @Mock private PreferenceScreen mPreferenceScreen;
     @Mock private BatteryInfo mBatteryInfo;
     @Mock private EntityHeaderController mEntityHeaderController;
-    @Mock private UsageProgressBarPreference mBatteryUsageProgressBarPref;
+    @Mock private BatteryHeaderTextPreference mBatteryHeaderTextPreference;
     @Mock private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
     @Mock private UsbPort mUsbPort;
     @Mock private UsbManager mUsbManager;
     @Mock private UsbPortStatus mUsbPortStatus;
 
-    private BatteryHeaderPreferenceController mController;
+    private BatteryHeaderTextPreferenceController mController;
     private Context mContext;
     private ShadowPowerManager mShadowPowerManager;
     private Intent mBatteryIntent;
@@ -100,17 +98,17 @@
         mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
         doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
 
-        doReturn(mBatteryUsageProgressBarPref)
+        doReturn(mBatteryHeaderTextPreference)
                 .when(mPreferenceScreen)
-                .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
+                .findPreference(PREF_KEY);
 
         mBatteryInfo.batteryLevel = BATTERY_LEVEL;
 
         mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
         mFactory = FakeFeatureFactory.setupForTest();
 
-        mController = spy(new BatteryHeaderPreferenceController(mContext, PREF_KEY));
-        mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
+        mController = spy(new BatteryHeaderTextPreferenceController(mContext, PREF_KEY));
+        mController.mBatteryHeaderTextPreference = mBatteryHeaderTextPreference;
         mController.mBatteryStatusFeatureProvider = mBatteryStatusFeatureProvider;
 
         BatteryUtils.setChargingStringV2Enabled(null);
@@ -123,20 +121,12 @@
     }
 
     @Test
-    public void displayPreference_displayBatteryLevel() {
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
     public void updatePreference_hasRemainingTime_showRemainingLabel() {
         mBatteryInfo.remainingLabel = TIME_LEFT;
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
     }
 
     @Test
@@ -145,9 +135,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
     }
 
     @Test
@@ -157,7 +145,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
+        verify(mBatteryHeaderTextPreference).setText(BATTERY_STATUS);
     }
 
     @Test
@@ -168,7 +156,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(BATTERY_STATUS);
+        verify(mBatteryHeaderTextPreference).setText(BATTERY_STATUS);
     }
 
     @Test
@@ -178,7 +166,7 @@
         mController.updateHeaderPreference(mBatteryInfo);
 
         final String expectedResult = BATTERY_STATUS + " • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
+        verify(mBatteryHeaderTextPreference).setText(expectedResult);
     }
 
     @Test
@@ -189,17 +177,7 @@
         mController.updateHeaderPreference(mBatteryInfo);
 
         final String expectedResult = "Battery Saver on • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
-    }
-
-    @Test
-    public void updatePreference_triggerBatteryStatusUpdateTrue_updatePercentageAndUsageOnly() {
-        setChargingState(/* isDischarging */ true, /* updatedByStatusFeature */ true);
-
-        mController.updateHeaderPreference(mBatteryInfo);
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+        verify(mBatteryHeaderTextPreference).setText(expectedResult);
     }
 
     @Test
@@ -208,9 +186,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
     }
 
     @Test
@@ -219,7 +195,7 @@
 
         mController.updateBatteryStatus(null, mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
     }
 
     @Test
@@ -229,7 +205,7 @@
         final String label = "Update by battery status • " + TIME_LEFT;
         mController.updateBatteryStatus(label, mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
+        verify(mBatteryHeaderTextPreference).setText(label);
     }
 
     @Test
@@ -244,7 +220,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
     }
 
     @Test
@@ -259,7 +235,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
     }
 
     @Test
@@ -274,7 +250,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
     }
 
     @Test
@@ -297,8 +273,8 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(label);
-        verify(mBatteryUsageProgressBarPref).setBottomSummaryContentDescription(contentDescription);
+        verify(mBatteryHeaderTextPreference).setText(label);
+        verify(mBatteryHeaderTextPreference).setContentDescription(contentDescription);
     }
 
     @Test
@@ -315,9 +291,8 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-        verify(mBatteryUsageProgressBarPref, never())
-                .setBottomSummaryContentDescription(contentDescription);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+        verify(mBatteryHeaderTextPreference, never()).setContentDescription(contentDescription);
     }
 
     @Test
@@ -334,9 +309,8 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
-        verify(mBatteryUsageProgressBarPref, never())
-                .setBottomSummaryContentDescription(contentDescription);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
+        verify(mBatteryHeaderTextPreference, never()).setContentDescription(contentDescription);
     }
 
     @Test
@@ -353,7 +327,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
     }
 
     @Test
@@ -370,7 +344,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
     }
 
     @Test
@@ -387,7 +361,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, batteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedChargingString);
+        verify(mBatteryHeaderTextPreference).setText(expectedChargingString);
     }
 
     @Test
@@ -398,7 +372,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expected);
+        verify(mBatteryHeaderTextPreference).setText(expected);
     }
 
     @Test
@@ -409,7 +383,7 @@
 
         mController.updateBatteryStatus(/* label= */ null, mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expected);
+        verify(mBatteryHeaderTextPreference).setText(expected);
     }
 
     private BatteryInfo arrangeUpdateBatteryStatusTestWithRemainingLabel(
@@ -436,7 +410,7 @@
         mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
 
         final String expectedResult = "Low battery • " + TIME_LEFT;
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);
+        verify(mBatteryHeaderTextPreference).setText(expectedResult);
     }
 
     @Test
@@ -446,7 +420,7 @@
 
         mController.updateHeaderByBatteryTips(lowBatteryTip, mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(mBatteryInfo.remainingLabel);
+        verify(mBatteryHeaderTextPreference).setText(mBatteryInfo.remainingLabel);
     }
 
     @Test
@@ -455,7 +429,7 @@
 
         mController.updateHeaderByBatteryTips(null, mBatteryInfo);
 
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
+        verifyNoInteractions(mBatteryHeaderTextPreference);
     }
 
     @Test
@@ -465,7 +439,7 @@
 
         mController.updateHeaderByBatteryTips(lowBatteryTip, null);
 
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
+        verifyNoInteractions(mBatteryHeaderTextPreference);
     }
 
     @Test
@@ -474,9 +448,7 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref)
-                .setBottomSummary(
-                        mContext.getString(
+        verify(mBatteryHeaderTextPreference).setText(mContext.getString(
                                 com.android.settingslib.R.string
                                         .battery_info_status_charging_on_hold));
     }
@@ -487,21 +459,13 @@
 
         mController.updateHeaderPreference(mBatteryInfo);
 
-        verify(mBatteryUsageProgressBarPref)
-                .setBottomSummary(
+        verify(mBatteryHeaderTextPreference)
+                .setText(
                         mContext.getString(
                                 com.android.settingslib.R.string.battery_info_status_not_charging));
     }
 
     @Test
-    public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
-        mController.quickUpdateHeaderPreference();
-
-        verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
-        verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
-    }
-
-    @Test
     public void getAvailabilityStatus_returnAvailableUnsearchable() {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
@@ -513,18 +477,7 @@
 
         mController.displayPreference(mPreferenceScreen);
 
-        assertThat(mBatteryUsageProgressBarPref.isVisible()).isFalse();
-    }
-
-    @Test
-    public void displayPreference_init_showEmptySpace() {
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mBatteryUsageProgressBarPref).setBottomSummary(" ");
-    }
-
-    private CharSequence formatBatteryPercentageText() {
-        return com.android.settings.Utils.formatPercentage(BATTERY_LEVEL);
+        assertThat(mBatteryHeaderTextPreference.isVisible()).isFalse();
     }
 
     private void setChargingState(boolean isDischarging, boolean updatedByStatusFeature) {
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
index 3b6e943..52c3179 100644
--- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
@@ -16,38 +16,37 @@
 
 package com.android.settings.network.telephony;
 
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
+import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.os.Looper;
-import android.os.PersistableBundle;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.telephony.CarrierConfigManager;
-import android.telephony.satellite.SatelliteManager;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.internal.telephony.flags.Flags;
-import com.android.settings.network.CarrierConfigCache;
+import com.android.settings.R;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
+import java.util.List;
+
 @RunWith(AndroidJUnit4.class)
 public class SatelliteSettingsPreferenceCategoryControllerTest {
     private static final String KEY = "key";
@@ -55,16 +54,9 @@
 
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-    @Rule
-    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
-    @Mock
-    private CarrierConfigCache mCarrierConfigCache;
 
     private Context mContext = null;
-    private SatelliteManager mSatelliteManager = null;
     private SatelliteSettingsPreferenceCategoryController mController = null;
-    private PersistableBundle mCarrierConfig = new PersistableBundle();
 
     @Before
     public void setUp() {
@@ -72,25 +64,38 @@
             Looper.prepare();
         }
         mContext = spy(ApplicationProvider.getApplicationContext());
-        mSatelliteManager = new SatelliteManager(mContext);
-        CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);
-        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(mSatelliteManager);
         mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
-    public void getAvailabilityStatus_featureDisabled_returnUnsupport() {
+    public void getAvailabilityStatus_default_returnUnsupported() {
         int result = mController.getAvailabilityStatus(TEST_SUB_ID);
-
         assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
-    public void getAvailabilityStatus_noSatellite_returnUnsupport() {
-        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);
-        mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);
+    public void getAvailabilityStatus_hasAvailablePreference_returnAvailableUnsearchable() {
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
+        preferenceCategory.setKey(KEY);
+        preferenceScreen.addPreference(preferenceCategory);
+        preferenceCategory.addPreference(new Preference(mContext));
+        mController.displayPreference(preferenceScreen);
+
+        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+
+        assertThat(result).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noAvailablePreference_returnUnsupported() {
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
+        preferenceCategory.setKey(KEY);
+        preferenceScreen.addPreference(preferenceCategory);
+        mController.displayPreference(preferenceScreen);
 
         int result = mController.getAvailabilityStatus(TEST_SUB_ID);
 
@@ -98,30 +103,37 @@
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
-    public void getAvailabilityStatus_carrierIsNotSupport_returnUnavailable() {
-        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);
-        mCarrierConfig.putBoolean(
-                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
-                false);
-        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig);
+    public void setPreferenceTitle_hasDataService_showConnectivity() {
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
+        preferenceCategory.setKey(KEY);
+        preferenceScreen.addPreference(preferenceCategory);
+        preferenceCategory.addPreference(new Preference(mContext));
+        mController.displayPreference(preferenceScreen);
 
-        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
+                List.of(SERVICE_TYPE_DATA));
 
-        assertThat(result).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+        assertThat(preferenceCategory.getTitle()).isEqualTo(
+                mContext.getString(R.string.satellite_setting_connectivity));
     }
 
+
     @Test
-    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
-    public void getAvailabilityStatus_carrierIsSupport_returnAvailable() {
-        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null);
-        mCarrierConfig.putBoolean(
-                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
-                true);
-        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig);
+    public void setPreferenceTitle_hasSmsService_showMessaging() {
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
+        preferenceCategory.setKey(KEY);
+        preferenceScreen.addPreference(preferenceCategory);
+        preferenceCategory.addPreference(new Preference(mContext));
+        mController.displayPreference(preferenceScreen);
 
-        int result = mController.getAvailabilityStatus(TEST_SUB_ID);
+        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
+                List.of(SERVICE_TYPE_SMS));
 
-        assertThat(result).isEqualTo(AVAILABLE);
+        assertThat(preferenceCategory.getTitle()).isEqualTo(
+                mContext.getString(R.string.satellite_setting_title));
     }
 }