PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix battery history details" into nyc-dev

Browse Source 
am: 43fa74b

* commit '43fa74b9fdaf8398d0c1498311b307fbfea135a0':
  Fix battery history details

Change-Id: I57cc3e650cb9b1d0ff0d786dc6e27179d27107bb
This commit is contained in:
Jason Monk
2016-04-11 19:06:55 +00:00
committed by android-build-merger
parent 50528a4e00 43fa74b9fd
commit 9eeb3f3d2d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/battery_history_detail.xml
View File

@@ -41,7 +41,7 @@
<com.android.settingslib.graph.UsageView
android:id="@+id/battery_usage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="141dp"
settings:sideLabels="@array/battery_labels"
android:colorAccent="?android:attr/colorAccent"
android:gravity="end"

1
src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
View File

@@ -75,6 +75,7 @@ public class BatteryHistoryDetail extends SettingsPreferenceFragment {
mCpuParser = new BatteryFlagParser(accentColor, false,
HistoryItem.STATE_CPU_RUNNING_FLAG);
mPhoneParser = new BatteryCellParser();
setHasOptionsMenu(true);
}
@Override