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

am a712c3b7: A couple small settings fixes:

Browse Source 
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
parent e86ec30f3f a712c3b7b5
commit 4962c855b8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/manage_applications.xml
View File

@@ -20,7 +20,8 @@
<FrameLayout android:id="@+id/list_container" <FrameLayout android:id="@+id/list_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:visibility="gone">
<ListView android:id="@android:id/list" <ListView android:id="@android:id/list"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -36,7 +37,8 @@
<view class="com.android.settings.applications.RunningProcessesView" <view class="com.android.settings.applications.RunningProcessesView"
android:id="@+id/running_processes" android:id="@+id/running_processes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:visibility="gone" />
<LinearLayout android:id="@+id/loading_container" <LinearLayout android:id="@+id/loading_container"
android:orientation="vertical" android:orientation="vertical"

4
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -411,8 +411,8 @@ public class BatteryHistoryChart extends View {
mScreenOnOffset = mChargingOffset + barOffset; mScreenOnOffset = mChargingOffset + barOffset;
mWakeLockOffset = mScreenOnOffset + barOffset; mWakeLockOffset = mScreenOnOffset + barOffset;
mWifiRunningOffset = mWakeLockOffset + barOffset; mWifiRunningOffset = mWakeLockOffset + barOffset;
mGpsOnOffset = mHaveWifi ? (mWifiRunningOffset + barOffset) : mWakeLockOffset; mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? barOffset : 0);
mPhoneSignalOffset = mHaveGps ? (mGpsOnOffset + barOffset) : mWifiRunningOffset; mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? barOffset : 0);
mLevelOffset = mPhoneSignalOffset + barOffset + mLineWidth; mLevelOffset = mPhoneSignalOffset + barOffset + mLineWidth;
mPhoneSignalTicks = new int[w+2]; mPhoneSignalTicks = new int[w+2];
} else { } else {