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

Commit 6e960552 authored by Lei Yu's avatar Lei Yu
Browse files

Remove battery usage preference in app info page 

Bug: 78011526
Test: RunSettingsRoboTests
Change-Id: I2dfb989167fe27857590f416fbb16d401e53bc1d
parent 70bd0c6d

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -5315,8 +5315,6 @@ 
    <string name="battery_detail_background">While in background</string>

    <!-- Title for battery usage amount by this app. [CHAR LIMIT=80] -->

    <string name="battery_detail_power_usage">Battery usage</string>

    <!-- Description for battery usage amount, i.e. 16% of overall app usage(340 mAh). [CHAR LIMIT=120] -->

    <string name="battery_detail_power_percentage"><xliff:g id="percent">%1$s</xliff:g> of total app usage (<xliff:g id="power">%2$d</xliff:g>mAh)</string>

    <!-- Title for the battery usage group, which means all the battery data are calculated 'since full charge' [CHAR LIMIT=40] -->

    <string name ="battery_detail_info_title">Since full charge</string>

    <!-- Title for the battery management group [CHAR LIMIT=40] -->

res/xml/power_usage_detail.xml

+0 −5
Original line number Diff line number Diff line
@@ -61,11 +61,6 @@ 
            android:title="@string/battery_detail_background"

            android:selectable="false"/>



        <Preference

            android:key="app_power_usage"

            android:title="@string/battery_detail_power_usage"

            android:selectable="false"/>



    </PreferenceCategory>



</PreferenceScreen>
 
 No newline at end of file

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

+0 −6
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 


    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_POWER_USAGE = "app_power_usage";

    private static final String KEY_PREF_HEADER = "header_view";



    private static final int REQUEST_UNINSTALL = 0;
@@ -109,8 +108,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
    @VisibleForTesting

    Preference mBackgroundPreference;

    @VisibleForTesting

    Preference mPowerUsagePreference;

    @VisibleForTesting

    AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;

    private AppButtonsPreferenceController mAppButtonsPreferenceController;

    private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController;
@@ -221,7 +218,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
                (SettingsActivity) getActivity(), this);

        mForegroundPreference = findPreference(KEY_PREF_FOREGROUND);

        mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND);

        mPowerUsagePreference = findPreference(KEY_PREF_POWER_USAGE);

        mHeaderPreference = (LayoutPreference) findPreference(KEY_PREF_HEADER);



        if (mPackageName != null) {
@@ -297,8 +293,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        mBackgroundPreference.setSummary(

                TextUtils.expandTemplate(getText(R.string.battery_active_for),

                        StringUtil.formatElapsedTime(context, backgroundTimeMs, false)));

        mPowerUsagePreference.setSummary(

                getString(R.string.battery_detail_power_percentage, usagePercent, powerMah));

    }



    @Override

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

+0 −7
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ public class AdvancedPowerUsageDetailTest { 
    private Context mContext;

    private Preference mForegroundPreference;

    private Preference mBackgroundPreference;

    private Preference mPowerUsagePreference;

    private AdvancedPowerUsageDetail mFragment;

    private SettingsActivity mTestActivity;

    private List<Anomaly> mAnomalies;
@@ -214,10 +213,8 @@ public class AdvancedPowerUsageDetailTest { 


        mForegroundPreference = new Preference(mContext);

        mBackgroundPreference = new Preference(mContext);

        mPowerUsagePreference = new Preference(mContext);

        mFragment.mForegroundPreference = mForegroundPreference;

        mFragment.mBackgroundPreference = mBackgroundPreference;

        mFragment.mPowerUsagePreference = mPowerUsagePreference;

        mFragment.mAnomalySummaryPreferenceController = mAnomalySummaryPreferenceController;



        mAnomalies = new ArrayList<>();
@@ -412,15 +409,11 @@ public class AdvancedPowerUsageDetailTest { 
                R.string.battery_used_for);

        doReturn(mContext.getText(R.string.battery_active_for)).when(mFragment).getText(

                R.string.battery_active_for);

        doReturn(mContext.getString(R.string.battery_detail_power_percentage, USAGE_PERCENT,

                POWER_MAH)).when(mFragment)

                .getString(R.string.battery_detail_power_percentage, USAGE_PERCENT, POWER_MAH);



        mFragment.initPreference();



        assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0 min");

        assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0 min");

        assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)");

    }



    @Test