[Flags][SB] Remove BATTERY_SHIELD_ICON flag; use the resource directly.

Fixes: 256623670
Test: verify BatteryMeterView.mDisplayShieldEnabled is false on phone
Test: verify BatteryMeterView.mDisplayShieldEnabled is true on tablet
Test: atest BatteryMeterViewControllerTest
Change-Id: Id2ce8dd0af138a0dbc6af422c0dd17dd640020c1

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java

@@ -30,9 +30,8 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
+import com.android.systemui.R;
 import com.android.systemui.dagger.qualifiers.Main;
-import com.android.systemui.flags.FeatureFlags;
-import com.android.systemui.flags.Flags;
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.phone.StatusBarIconController;
 import com.android.systemui.statusbar.policy.BatteryController;
@@ -118,7 +117,6 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
             TunerService tunerService,
             @Main Handler mainHandler,
             ContentResolver contentResolver,
-            FeatureFlags featureFlags,
             BatteryController batteryController) {
         super(view);
         mUserTracker = userTracker;
@@ -129,7 +127,8 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
         mBatteryController = batteryController;
 
         mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);
-        mView.setDisplayShieldEnabled(featureFlags.isEnabled(Flags.BATTERY_SHIELD_ICON));
+        mView.setDisplayShieldEnabled(
+                getContext().getResources().getBoolean(R.bool.flag_battery_shield_icon));
 
         mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);
         mSettingObserver = new SettingObserver(mMainHandler);

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

@@ -378,11 +378,6 @@ object Flags {
     val NEW_STATUS_BAR_WIFI_ICON_BACKEND =
         unreleasedFlag(609, "new_status_bar_wifi_icon_backend", teamfood = true)
 
-    // TODO(b/256623670): Tracking Bug
-    @JvmField
-    val BATTERY_SHIELD_ICON =
-        resourceBooleanFlag(610, R.bool.flag_battery_shield_icon, "battery_shield_icon")
-
     // TODO(b/260881289): Tracking Bug
     val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =
         unreleasedFlag(611, "new_status_bar_icons_debug_coloring")

packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt

@@ -281,7 +281,6 @@ abstract class ShadeModule {
             tunerService: TunerService,
             @Main mainHandler: Handler,
             contentResolver: ContentResolver,
-            featureFlags: FeatureFlags,
             batteryController: BatteryController,
         ): BatteryMeterViewController {
             return BatteryMeterViewController(
@@ -291,7 +290,6 @@ abstract class ShadeModule {
                 tunerService,
                 mainHandler,
                 contentResolver,
-                featureFlags,
                 batteryController,
             )
         }

packages/SystemUI/tests/src/com/android/systemui/battery/BatteryMeterViewControllerTest.java

@@ -33,9 +33,8 @@ import android.provider.Settings;
 
 import androidx.test.filters.SmallTest;
 
+import com.android.systemui.R;
 import com.android.systemui.SysuiTestCase;
-import com.android.systemui.flags.FakeFeatureFlags;
-import com.android.systemui.flags.Flags;
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.policy.BatteryController;
 import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -61,7 +60,6 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
     private Handler mHandler;
     @Mock
     private ContentResolver mContentResolver;
-    private FakeFeatureFlags mFeatureFlags;
     @Mock
     private BatteryController mBatteryController;
 
@@ -74,8 +72,8 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
         when(mBatteryMeterView.getContext()).thenReturn(mContext);
         when(mBatteryMeterView.getResources()).thenReturn(mContext.getResources());
 
-        mFeatureFlags = new FakeFeatureFlags();
-        mFeatureFlags.set(Flags.BATTERY_SHIELD_ICON, false);
+        mContext.getOrCreateTestableResources().addOverride(
+                R.bool.flag_battery_shield_icon, false);
     }
 
     @Test
@@ -134,7 +132,8 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
 
     @Test
     public void shieldFlagDisabled_viewNotified() {
-        mFeatureFlags.set(Flags.BATTERY_SHIELD_ICON, false);
+        mContext.getOrCreateTestableResources().addOverride(
+                R.bool.flag_battery_shield_icon, false);
 
         initController();
 
@@ -143,7 +142,8 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
 
     @Test
     public void shieldFlagEnabled_viewNotified() {
-        mFeatureFlags.set(Flags.BATTERY_SHIELD_ICON, true);
+        mContext.getOrCreateTestableResources().addOverride(
+                R.bool.flag_battery_shield_icon, true);
 
         initController();
 
@@ -158,7 +158,6 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
                 mTunerService,
                 mHandler,
                 mContentResolver,
-                mFeatureFlags,
                 mBatteryController
         );
     }