Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3017822 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up app usage page" into sc-dev

parents 386d4ba8 72463703

res/xml/power_usage_detail.xml

+0 −18
Original line number Diff line number Diff line
@@ -52,24 +52,6 @@ 


    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/battery_detail_manage_title"

        settings:allowDividerAbove="true">



        <com.android.settingslib.RestrictedPreference

            android:key="background_activity"

            android:title="@string/background_activity_title"

            android:selectable="true"

            settings:userRestriction="no_control_apps"/>



        <Preference

            android:key="battery_optimization"

            android:title="@string/high_power_apps"

            android:summary="@string/high_power_off"

            android:selectable="true"/>



    </PreferenceCategory>



    <com.android.settingslib.widget.FooterPreference

        android:key="app_usage_footer_preference"

        android:title="@string/manager_battery_usage_footer"

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

+1 −24
Original line number Diff line number Diff line
@@ -41,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.widget.EntityHeaderController;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.applications.ApplicationsState;
@@ -62,7 +60,7 @@ import java.util.List; 
 */

public class AdvancedPowerUsageDetail extends DashboardFragment implements

        ButtonActionDialogFragment.AppButtonsDialogListener,

        BatteryTipPreferenceController.BatteryTipListener, RadioButtonPreference.OnClickListener {

        RadioButtonPreference.OnClickListener {



    public static final String TAG = "AdvancedPowerDetail";

    public static final String EXTRA_UID = "extra_uid";
@@ -74,8 +72,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";
@@ -96,10 +92,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
    @VisibleForTesting

    BatteryOptimizeUtils mBatteryOptimizeUtils;



    @VisibleForTesting

    Preference mForegroundPreference;

    @VisibleForTesting

    Preference mBackgroundPreference;

    @VisibleForTesting

    Preference mFooterPreference;

    @VisibleForTesting
@@ -109,7 +101,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
    @VisibleForTesting

    RadioButtonPreference mUnrestrictedPreference;

    private AppButtonsPreferenceController mAppButtonsPreferenceController;

    private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController;

    private UnrestrictedPreferenceController mUnrestrictedPreferenceController;

    private OptimizedPreferenceController mOptimizedPreferenceController;

    private RestrictedPreferenceController mRestrictedPreferenceController;
@@ -236,8 +227,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        super.onCreate(icicle);



        mPackageName = getArguments().getString(EXTRA_PACKAGE_NAME);

        mForegroundPreference = findPreference(KEY_PREF_FOREGROUND);

        mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND);

        mFooterPreference = findPreference(KEY_FOOTER_PREFERENCE);

        mHeaderPreference = (LayoutPreference) findPreference(KEY_PREF_HEADER);
@@ -288,7 +277,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
            mState.ensureIcon(mAppEntry);

            controller.setLabel(mAppEntry);

            controller.setIcon(mAppEntry);

            boolean isInstantApp = AppUtils.isInstant(mAppEntry.info);

            controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));

        }
@@ -358,11 +346,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        final int uid = bundle.getInt(EXTRA_UID, 0);

        final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);



        mBackgroundActivityPreferenceController = new BackgroundActivityPreferenceController(

                context, this, uid, packageName);

        controllers.add(mBackgroundActivityPreferenceController);

        controllers.add(new BatteryOptimizationPreferenceController(

                (SettingsActivity) getActivity(), this, packageName));

        mAppButtonsPreferenceController = new AppButtonsPreferenceController(

                (SettingsActivity) getActivity(), this, getSettingsLifecycle(), packageName, mState,

                REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN);
@@ -395,12 +378,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        }

    }



    @Override

    public void onBatteryTipHandled(BatteryTip batteryTip) {

        mBackgroundActivityPreferenceController.updateSummary(

                findPreference(mBackgroundActivityPreferenceController.getPreferenceKey()));

    }



    @Override

    public void onRadioButtonClicked(RadioButtonPreference selected) {

        updatePreferenceState(mUnrestrictedPreference, selected.getKey());

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

+0 −19
Original line number Diff line number Diff line
@@ -23,11 +23,9 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;
@@ -49,7 +47,6 @@ import androidx.loader.app.LoaderManager; 
import androidx.preference.Preference;

import androidx.recyclerview.widget.RecyclerView;



import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowActivityManager;
@@ -85,20 +82,12 @@ public class AdvancedPowerUsageDetailTest { 
    private static final String USAGE_PERCENT = "16%";

    private static final int ICON_ID = 123;

    private static final int UID = 1;

    private static final int POWER_MAH = 150;

    private static final long BACKGROUND_TIME_MS = 100;

    private static final long FOREGROUND_ACTIVITY_TIME_MS = 123;

    private static final long FOREGROUND_SERVICE_TIME_MS = 444;

    private static final long FOREGROUND_TIME_MS =

            FOREGROUND_ACTIVITY_TIME_MS + FOREGROUND_SERVICE_TIME_MS;

    private static final long PROCSTATE_TOP_TIME_MS = FOREGROUND_ACTIVITY_TIME_MS;

    private static final long BACKGROUND_TIME_US = BACKGROUND_TIME_MS * 1000;

    private static final long FOREGROUND_ACTIVITY_TIME_US = FOREGROUND_ACTIVITY_TIME_MS * 1000;

    private static final long FOREGROUND_SERVICE_TIME_US = FOREGROUND_SERVICE_TIME_MS * 1000;

    private static final long FOREGROUND_TIME_US = FOREGROUND_TIME_MS * 1000;

    private static final long PROCSTATE_TOP_TIME_US = PROCSTATE_TOP_TIME_MS * 1000;

    private static final long PHONE_FOREGROUND_TIME_MS = 250 * 1000;

    private static final long PHONE_BACKGROUND_TIME_MS = 0;

    private static final String KEY_PREF_UNRESTRICTED = "unrestricted_pref";

    private static final String KEY_PREF_OPTIMIZED = "optimized_pref";

    private static final String KEY_PREF_RESTRICTED = "restricted_pref";
@@ -124,14 +113,10 @@ public class AdvancedPowerUsageDetailTest { 
    @Mock

    private LoaderManager mLoaderManager;

    @Mock

    private BatteryStats.Timer mForegroundActivityTimer;

    @Mock

    private BatteryUtils mBatteryUtils;

    @Mock

    private BatteryOptimizeUtils mBatteryOptimizeUtils;

    private Context mContext;

    private Preference mForegroundPreference;

    private Preference mBackgroundPreference;

    private Preference mFooterPreference;

    private RadioButtonPreference mRestrictedPreference;

    private RadioButtonPreference mOptimizePreference;
@@ -205,14 +190,10 @@ public class AdvancedPowerUsageDetailTest { 
                nullable(UserHandle.class));

        doAnswer(callable).when(mActivity).startActivity(captor.capture());



        mForegroundPreference = new Preference(mContext);

        mBackgroundPreference = new Preference(mContext);

        mFooterPreference = new Preference(mContext);

        mRestrictedPreference = new RadioButtonPreference(mContext);

        mOptimizePreference = new RadioButtonPreference(mContext);

        mUnrestrictedPreference = new RadioButtonPreference(mContext);

        mFragment.mForegroundPreference = mForegroundPreference;

        mFragment.mBackgroundPreference = mBackgroundPreference;

        mFragment.mFooterPreference = mFooterPreference;

        mFragment.mRestrictedPreference = mRestrictedPreference;

        mFragment.mOptimizePreference = mOptimizePreference;