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

Commit 1a129e0f authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Remove battery history graph from details screen" into mnc-dev

parents 58f6728e 04ac693d

res/xml/power_usage_details.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">



        <com.android.settings.fuelgauge.BatteryHistoryPreference

            android:key="battery_history" />



        <com.android.settings.applications.LayoutPreference

            android:key="two_buttons"

            android:layout="@layout/two_buttons_panel"

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

+0 −9
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi 
    private static final String KEY_CONTROLS_PARENT = "controls_parent";

    private static final String KEY_MESSAGES_PARENT = "messages_parent";

    private static final String KEY_PACKAGES_PARENT = "packages_parent";

    private static final String KEY_BATTERY_HISTORY = "battery_history";

    private static final String KEY_TWO_BUTTONS = "two_buttons";

    private static final String KEY_HIGH_POWER = "high_power";
@@ -319,7 +318,6 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi 
    private BatterySipper.DrainType mDrainType;

    private double mNoCoverage; // Percentage of time that there was no coverage



    private BatteryHistoryPreference mHistPref;

    private PreferenceCategory mDetailsParent;

    private PreferenceCategory mControlsParent;

    private PreferenceCategory mMessagesParent;
@@ -341,7 +339,6 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi 
        mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);



        addPreferencesFromResource(R.xml.power_usage_details);

        mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_HISTORY);

        mDetailsParent = (PreferenceCategory) findPreference(KEY_DETAILS_PARENT);

        mControlsParent = (PreferenceCategory) findPreference(KEY_CONTROLS_PARENT);

        mMessagesParent = (PreferenceCategory) findPreference(KEY_MESSAGES_PARENT);
@@ -441,12 +438,6 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi 
        fillMessagesSection(mUid);

    }



    @Override

    protected void refreshStats() {

        super.refreshStats();

        updatePreference(mHistPref);

    }



    private void setupHeader() {

        final Bundle args = getArguments();

        String title = args.getString(EXTRA_TITLE);