diff options
| author | Heemin Seog <hseog@google.com> | 2020-07-16 02:04:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 02:04:00 +0000 |
| commit | 8dd29d0195ffc89c668cfbb1044609e6003de7a5 (patch) | |
| tree | f147cf94a7ef45779bccb55cb7e9b720025de19e /packages/CarSystemUI | |
| parent | d2d9f54da17cafe885bb006c35f58858dcc79256 (diff) | |
| parent | 9b9a8e1b555508c213e616b56d1d13f42e3818fd (diff) | |
Merge "Address lifecycle crash in car sysui" into rvc-dev am: c42d4b65c8 am: 9b9a8e1b55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163205
Change-Id: Ice2a2fd1f1fa36f567bb5040044a2740f5fa14dd
Diffstat (limited to 'packages/CarSystemUI')
| -rw-r--r-- | packages/CarSystemUI/res/layout/system_icons.xml | 6 | ||||
| -rw-r--r-- | packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/packages/CarSystemUI/res/layout/system_icons.xml b/packages/CarSystemUI/res/layout/system_icons.xml index a7dd65eab550..d23579294ce8 100644 --- a/packages/CarSystemUI/res/layout/system_icons.xml +++ b/packages/CarSystemUI/res/layout/system_icons.xml @@ -31,10 +31,4 @@ android:gravity="center_vertical" android:orientation="horizontal" /> - - <com.android.systemui.BatteryMeterView - android:id="@+id/battery" - android:layout_width="0dp" - android:layout_height="match_parent" - /> </LinearLayout>
\ No newline at end of file diff --git a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java index bab67154e75d..0a677bfaa742 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java @@ -26,7 +26,6 @@ import android.widget.LinearLayout; import androidx.annotation.IdRes; import com.android.settingslib.Utils; -import com.android.systemui.BatteryMeterView; import com.android.systemui.R; import com.android.systemui.plugins.DarkIconDispatcher; @@ -49,10 +48,7 @@ public class CarStatusBarHeader extends LinearLayout { float intensity = colorForeground == Color.WHITE ? 0f : 1f; Rect tintArea = new Rect(0, 0, 0, 0); - applyDarkness(R.id.battery, tintArea, intensity, colorForeground); applyDarkness(R.id.clock, tintArea, intensity, colorForeground); - - ((BatteryMeterView) findViewById(R.id.battery)).setForceShowPercent(true); } private void applyDarkness(@IdRes int id, Rect tintArea, float intensity, int color) { |