Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c42d4b65 authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "Address lifecycle crash in car sysui" into rvc-dev

parents 0b649ebc d7996611

packages/CarSystemUI/res/layout/system_icons.xml

+0 −6
Original line number Diff line number Diff line
@@ -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

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

+0 −4
Original line number Diff line number Diff line
@@ -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) {