Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6e0b89a5: am 47c46dd5: Merge "Battery icon tweaks." into klp-dev

Browse Source 
* commit '6e0b89a5a035fc7759714c9323d381a4cf7be3d4':
  Battery icon tweaks.
This commit is contained in:
John Spurlock
2013-11-05 13:57:01 -08:00
committed by Android Git Automerger
parent 2b80a35cb5 6e0b89a5a0
commit 633626a096
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/status_bar.xml
View File

@@ -95,12 +95,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<!-- battery must be padded below by 2px to match assets -->
<!-- battery must be padded below to match assets -->
<com.android.systemui.BatteryMeterView
android:id="@+id/battery"
android:layout_height="16dp"
android:layout_width="10.5dp"
android:layout_marginBottom="2px"
android:layout_marginBottom="0.33dp"
android:layout_marginStart="4dip"
/>
</LinearLayout>

10
packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
View File

@@ -66,7 +66,7 @@ public class BatteryMeterView extends View implements DemoMode {
private final RectF mFrame = new RectF();
private final RectF mButtonFrame = new RectF();
private final RectF mClipFrame = new RectF();
private final Rect mBoltFrame = new Rect();
private final RectF mBoltFrame = new RectF();
private class BatteryTracker extends BroadcastReceiver {
public static final int UNKNOWN_LEVEL = -1;
@@ -319,10 +319,10 @@ public class BatteryMeterView extends View implements DemoMode {
if (tracker.plugged) {
// draw the bolt
final int bl = (int)(mFrame.left + mFrame.width() / 4.5f);
final int bt = (int)(mFrame.top + mFrame.height() / 6f);
final int br = (int)(mFrame.right - mFrame.width() / 7f);
final int bb = (int)(mFrame.bottom - mFrame.height() / 10f);
final float bl = mFrame.left + mFrame.width() / 4.5f;
final float bt = mFrame.top + mFrame.height() / 6f;
final float br = mFrame.right - mFrame.width() / 7f;
final float bb = mFrame.bottom - mFrame.height() / 10f;
if (mBoltFrame.left != bl || mBoltFrame.top != bt
|| mBoltFrame.right != br || mBoltFrame.bottom != bb) {
mBoltFrame.set(bl, bt, br, bb);