Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4962c855 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a712c3b7: A couple small settings fixes: 

Merge commit 'a712c3b7' into gingerbread-plus-aosp

* commit 'a712c3b7':
  A couple small settings fixes:
parents e86ec30f a712c3b7

res/layout/manage_applications.xml

+4 −2
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/fuelgauge/BatteryHistoryChart.java

+2 −2
Original line number Diff line number Diff line
@@ -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 {