Clean up legacy "optimization mode" design.

We have two different "Optimization mode" page design in the android R to support bi-state for AOSP and tri-state for Pixel device. From android T, we always show tri-state for both AOSP and Pixel. So it's time to clean up the legacy design for bi-state.
This change doesn't include string resources cleanup, which will be
included in a separated cl.

Bug: 232037602
Test: make RunSettingsRoboTests
Change-Id: I5194201d0b11e2dcea958d49bf07ed837a386465

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

@@ -32,7 +32,6 @@ import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -42,8 +41,6 @@ import com.android.settings.applications.appinfo.ButtonActionDialogFragment;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
-import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.HelpUtils;
@@ -66,7 +63,6 @@ import java.util.List;
  */
 public class AdvancedPowerUsageDetail extends DashboardFragment implements
         ButtonActionDialogFragment.AppButtonsDialogListener,
-        BatteryTipPreferenceController.BatteryTipListener,
         SelectorWithWidgetPreference.OnClickListener {
 
     public static final String TAG = "AdvancedPowerDetail";
@@ -80,8 +76,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     public static final String EXTRA_POWER_USAGE_PERCENT = "extra_power_usage_percent";
     public static final String EXTRA_POWER_USAGE_AMOUNT = "extra_power_usage_amount";
 
-    private static final String KEY_PREF_FOREGROUND = "app_usage_foreground";
-    private static final String KEY_PREF_BACKGROUND = "app_usage_background";
     private static final String KEY_PREF_HEADER = "header_view";
     private static final String KEY_PREF_UNRESTRICTED = "unrestricted_pref";
     private static final String KEY_PREF_OPTIMIZED = "optimized_pref";
@@ -103,10 +97,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     @VisibleForTesting
     BatteryOptimizeUtils mBatteryOptimizeUtils;
     @VisibleForTesting
-    Preference mForegroundPreference;
-    @VisibleForTesting
-    Preference mBackgroundPreference;
-    @VisibleForTesting
     FooterPreference mFooterPreference;
     @VisibleForTesting
     SelectorWithWidgetPreference mRestrictedPreference;
@@ -115,15 +105,12 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     @VisibleForTesting
     SelectorWithWidgetPreference mUnrestrictedPreference;
     @VisibleForTesting
-    boolean mEnableTriState = true;
-    @VisibleForTesting
     @BatteryOptimizeUtils.OptimizationMode
     int mOptimizationMode = BatteryOptimizeUtils.MODE_UNKNOWN;
     @VisibleForTesting
     BackupManager mBackupManager;
 
     private AppButtonsPreferenceController mAppButtonsPreferenceController;
-    private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController;
 
     // A wrapper class to carry LaunchBatteryDetailPage required arguments.
     private static final class LaunchBatteryDetailPageArgs {
@@ -252,12 +239,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         super.onCreate(icicle);
 
         final String packageName = getArguments().getString(EXTRA_PACKAGE_NAME);
-        if (mEnableTriState) {
-            onCreateForTriState(packageName);
-        } else {
-            mForegroundPreference = findPreference(KEY_PREF_FOREGROUND);
-            mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND);
-        }
+        onCreateForTriState(packageName);
         mHeaderPreference = findPreference(KEY_PREF_HEADER);
 
         if (packageName != null) {
@@ -270,31 +252,26 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         super.onResume();
 
         initHeader();
-        if (mEnableTriState) {
-            mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
-            initPreferenceForTriState(getContext());
-            final String packageName = mBatteryOptimizeUtils.getPackageName();
-            FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
+        mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
+        initPreferenceForTriState(getContext());
+        final String packageName = mBatteryOptimizeUtils.getPackageName();
+        FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
                 .action(
-                    getContext(),
-                    SettingsEnums.OPEN_APP_BATTERY_USAGE,
-                    packageName);
-        } else {
-            initPreference(getContext());
-        }
+                getContext(),
+                SettingsEnums.OPEN_APP_BATTERY_USAGE,
+                packageName);
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        if (mEnableTriState) {
-            final int selectedPreference = getSelectedPreference();
 
-            notifyBackupManager();
-            logMetricCategory(selectedPreference);
-            mBatteryOptimizeUtils.setAppUsageState(selectedPreference);
-            Log.d(TAG, "Leave with mode: " + selectedPreference);
-        }
+        final int selectedPreference = getSelectedPreference();
+
+        notifyBackupManager();
+        logMetricCategory(selectedPreference);
+        mBatteryOptimizeUtils.setAppUsageState(selectedPreference);
+        Log.d(TAG, "Leave with mode: " + selectedPreference);
     }
 
     @VisibleForTesting
@@ -333,34 +310,10 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
             controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));
         }
 
-        if (mEnableTriState) {
-            controller.setSummary(getAppActiveTime(bundle));
-        }
-
+        controller.setSummary(getAppActiveTime(bundle));
         controller.done(context, true /* rebindActions */);
     }
 
-    @VisibleForTesting
-    void initPreference(Context context) {
-        final Bundle bundle = getArguments();
-        final long foregroundTimeMs = bundle.getLong(EXTRA_FOREGROUND_TIME);
-        final long backgroundTimeMs = bundle.getLong(EXTRA_BACKGROUND_TIME);
-        mForegroundPreference.setSummary(
-                TextUtils.expandTemplate(getText(R.string.battery_used_for),
-                        StringUtil.formatElapsedTime(
-                                context,
-                                foregroundTimeMs,
-                                /* withSeconds */ false,
-                                /* collapseTimeUnit */ false)));
-        mBackgroundPreference.setSummary(
-                TextUtils.expandTemplate(getText(R.string.battery_active_for),
-                        StringUtil.formatElapsedTime(
-                                context,
-                                backgroundTimeMs,
-                                /* withSeconds */ false,
-                                /* collapseTimeUnit */ false)));
-    }
-
     @VisibleForTesting
     void initPreferenceForTriState(Context context) {
         final String stateString;
@@ -403,7 +356,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
 
     @Override
     protected int getPreferenceScreenResId() {
-        return mEnableTriState ? R.xml.power_usage_detail : R.xml.power_usage_detail_legacy;
+        return R.xml.power_usage_detail;
     }
 
     @Override
@@ -417,17 +370,9 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
                 (SettingsActivity) getActivity(), this, getSettingsLifecycle(),
                 packageName, mState, REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN);
         controllers.add(mAppButtonsPreferenceController);
-        if (mEnableTriState) {
-            controllers.add(new UnrestrictedPreferenceController(context, uid, packageName));
-            controllers.add(new OptimizedPreferenceController(context, uid, packageName));
-            controllers.add(new RestrictedPreferenceController(context, uid, packageName));
-        } else {
-            mBackgroundActivityPreferenceController = new BackgroundActivityPreferenceController(
-                    context, this, uid, packageName);
-            controllers.add(mBackgroundActivityPreferenceController);
-            controllers.add(new BatteryOptimizationPreferenceController(
-                    (SettingsActivity) getActivity(), this, packageName));
-        }
+        controllers.add(new UnrestrictedPreferenceController(context, uid, packageName));
+        controllers.add(new OptimizedPreferenceController(context, uid, packageName));
+        controllers.add(new RestrictedPreferenceController(context, uid, packageName));
 
         return controllers;
     }
@@ -447,12 +392,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         }
     }
 
-    @Override
-    public void onBatteryTipHandled(BatteryTip batteryTip) {
-        mBackgroundActivityPreferenceController.updateSummary(
-                findPreference(mBackgroundActivityPreferenceController.getPreferenceKey()));
-    }
-
     @Override
     public void onRadioButtonClicked(SelectorWithWidgetPreference selected) {
         final String selectedKey = selected.getKey();