summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/fuelgauge
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-18 17:47:39 -0700
committerDianne Hackborn <hackbod@google.com>2010-08-18 17:47:39 -0700
commita712c3b7b5a17129d016ede082e3e3b2bbd31f9a (patch)
tree4837794c21438b535fc1fd7e1da109feae5820e3 /src/com/android/settings/fuelgauge
parentf8a91b535b05619061dad5870db2318b012bbc0b (diff)
downloadpackages_apps_Settings-a712c3b7b5a17129d016ede082e3e3b2bbd31f9a.tar.gz
packages_apps_Settings-a712c3b7b5a17129d016ede082e3e3b2bbd31f9a.tar.bz2
packages_apps_Settings-a712c3b7b5a17129d016ede082e3e3b2bbd31f9a.zip
A couple small settings fixes:
- Correctly position WIFI/GPS charts. - Start out with running services hidden in case we need to show the progress bar. Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
Diffstat (limited to 'src/com/android/settings/fuelgauge')
-rw-r--r--src/com/android/settings/fuelgauge/BatteryHistoryChart.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 25d86098f..acd9ee447 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -411,8 +411,8 @@ public class BatteryHistoryChart extends View {
mScreenOnOffset = mChargingOffset + barOffset;
mWakeLockOffset = mScreenOnOffset + barOffset;
mWifiRunningOffset = mWakeLockOffset + barOffset;
- mGpsOnOffset = mHaveWifi ? (mWifiRunningOffset + barOffset) : mWakeLockOffset;
- mPhoneSignalOffset = mHaveGps ? (mGpsOnOffset + barOffset) : mWifiRunningOffset;
+ mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? barOffset : 0);
+ mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? barOffset : 0);
mLevelOffset = mPhoneSignalOffset + barOffset + mLineWidth;
mPhoneSignalTicks = new int[w+2];
} else {