055bb61426
The old embedded percentage (introduced in change I6a3e7409) is hard to read at status bar size, so we now draw it in a separate TextView to the left (start) of the battery gauge. (The embedded code remains so that it can be used by other places where the battery is drawn larger.) The old system setting "status_bar_show_battery_percent" is still used to control whether this percentage is shown, but note that it now applies only to BatteryMeterView (i.e., the status bar) and not other usages of BatteryMeterDrawable. Bug: 32539932 Test: (manual) adb shell settings put system status_bar_show_battery_percent 1 Change-Id: Id298dba544f594b11269539284a2e8042fd4780b
38 lines
1.5 KiB
XML
38 lines
1.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?><!--
|
|
~ Copyright (C) 2014 The Android Open Source Project
|
|
~
|
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
|
~ you may not use this file except in compliance with the License.
|
|
~ You may obtain a copy of the License at
|
|
~
|
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
|
~
|
|
~ Unless required by applicable law or agreed to in writing, software
|
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
~ See the License for the specific language governing permissions and
|
|
~ limitations under the License
|
|
-->
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/system_icons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center_vertical">
|
|
|
|
<com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/statusIcons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"/>
|
|
|
|
<include layout="@layout/signal_cluster_view"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="@dimen/signal_cluster_margin_start"/>
|
|
|
|
<com.android.systemui.BatteryMeterView android:id="@+id/battery"
|
|
android:layout_height="match_parent"
|
|
android:layout_width="wrap_content"
|
|
/>
|
|
</LinearLayout> |