diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-18 18:42:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 18:42:18 -0700 |
| commit | 4962c855b871f1657ca6d90817567203e6863551 (patch) | |
| tree | 09d22af4f7802dba10e1180219f016b98ae159ae /src/com/android | |
| parent | e86ec30f3fc916f32e9c3e58d1f026a10f9b265f (diff) | |
| parent | a712c3b7b5a17129d016ede082e3e3b2bbd31f9a (diff) | |
| download | packages_apps_Settings-4962c855b871f1657ca6d90817567203e6863551.zip packages_apps_Settings-4962c855b871f1657ca6d90817567203e6863551.tar.gz packages_apps_Settings-4962c855b871f1657ca6d90817567203e6863551.tar.bz2 | |
am a712c3b7: A couple small settings fixes:
Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp
* commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
A couple small settings fixes:
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/fuelgauge/BatteryHistoryChart.java | 4 |
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 25d8609..acd9ee4 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 { |