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

Merge "Address lifecycle crash in car sysui" into rvc-dev am: c42d4b65c8 am: 9b9a8e1b55

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163205

Change-Id: I33d90a4b85ca32642998d415feab90cdda0e403d
This commit is contained in:
Heemin Seog
2020-07-16 02:04:19 +00:00
committed by Automerger Merge Worker
parent 0ce817b8ad 9b9a8e1b55
commit ce4304ef7d
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CarSystemUI/res/layout/system_icons.xml
View File

@@ -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>

4
packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java
View File

@@ -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) {