am a712c3b7: A couple small settings fixes:

Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp

* commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
  A couple small settings fixes:
This commit is contained in:
Dianne Hackborn
2010-08-18 18:42:18 -07:00
committed by Android Git Automerger
2 changed files with 6 additions and 4 deletions

View File

@@ -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 {