Merge "Address lifecycle crash in car sysui" into rvc-dev am: c42d4b65c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163205 Change-Id: Ia6935abc5817d024d1bf7877f514b5188ef01e47
This commit is contained in:
@@ -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>
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user