From a712c3b7b5a17129d016ede082e3e3b2bbd31f9a Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 18 Aug 2010 17:47:39 -0700
Subject: [PATCH] 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
---
 res/layout/manage_applications.xml                          | 6 ++++--
 src/com/android/settings/fuelgauge/BatteryHistoryChart.java | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications.xml
index 758e476cfdb..27164608f3b 100755
--- a/res/layout/manage_applications.xml
+++ b/res/layout/manage_applications.xml
@@ -20,7 +20,8 @@
 
     <FrameLayout android:id="@+id/list_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:visibility="gone">
         <ListView android:id="@android:id/list"
             android:drawSelectorOnTop="false"
             android:layout_width="match_parent"
@@ -36,7 +37,8 @@
     <view class="com.android.settings.applications.RunningProcessesView"
             android:id="@+id/running_processes"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:visibility="gone" />
 
     <LinearLayout android:id="@+id/loading_container"
             android:orientation="vertical"
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 25d86098f00..acd9ee447b4 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 {