Remove battery history graph from details screen
Bug: 21854416 Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
This commit is contained in:
@@ -17,9 +17,6 @@
|
|||||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
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
|
<com.android.settings.applications.LayoutPreference
|
||||||
android:key="two_buttons"
|
android:key="two_buttons"
|
||||||
android:layout="@layout/two_buttons_panel"
|
android:layout="@layout/two_buttons_panel"
|
||||||
|
@@ -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_CONTROLS_PARENT = "controls_parent";
|
||||||
private static final String KEY_MESSAGES_PARENT = "messages_parent";
|
private static final String KEY_MESSAGES_PARENT = "messages_parent";
|
||||||
private static final String KEY_PACKAGES_PARENT = "packages_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_TWO_BUTTONS = "two_buttons";
|
||||||
private static final String KEY_HIGH_POWER = "high_power";
|
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 BatterySipper.DrainType mDrainType;
|
||||||
private double mNoCoverage; // Percentage of time that there was no coverage
|
private double mNoCoverage; // Percentage of time that there was no coverage
|
||||||
|
|
||||||
private BatteryHistoryPreference mHistPref;
|
|
||||||
private PreferenceCategory mDetailsParent;
|
private PreferenceCategory mDetailsParent;
|
||||||
private PreferenceCategory mControlsParent;
|
private PreferenceCategory mControlsParent;
|
||||||
private PreferenceCategory mMessagesParent;
|
private PreferenceCategory mMessagesParent;
|
||||||
@@ -341,7 +339,6 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
|
|||||||
mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
|
mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
|
||||||
|
|
||||||
addPreferencesFromResource(R.xml.power_usage_details);
|
addPreferencesFromResource(R.xml.power_usage_details);
|
||||||
mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_HISTORY);
|
|
||||||
mDetailsParent = (PreferenceCategory) findPreference(KEY_DETAILS_PARENT);
|
mDetailsParent = (PreferenceCategory) findPreference(KEY_DETAILS_PARENT);
|
||||||
mControlsParent = (PreferenceCategory) findPreference(KEY_CONTROLS_PARENT);
|
mControlsParent = (PreferenceCategory) findPreference(KEY_CONTROLS_PARENT);
|
||||||
mMessagesParent = (PreferenceCategory) findPreference(KEY_MESSAGES_PARENT);
|
mMessagesParent = (PreferenceCategory) findPreference(KEY_MESSAGES_PARENT);
|
||||||
@@ -440,12 +437,6 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
|
|||||||
fillControlsSection(mUid);
|
fillControlsSection(mUid);
|
||||||
fillMessagesSection(mUid);
|
fillMessagesSection(mUid);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void refreshStats() {
|
|
||||||
super.refreshStats();
|
|
||||||
updatePreference(mHistPref);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setupHeader() {
|
private void setupHeader() {
|
||||||
final Bundle args = getArguments();
|
final Bundle args = getArguments();
|
||||||
|
Reference in New Issue
Block a user