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

Browse Source
This commit is contained in:
Heemin Seog
2020-07-16 01:35:59 +00:00
committed by Android (Google) Code Review
parent 0b649ebc96 d79966114a
commit c42d4b65c8
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:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
/> />
<com.android.systemui.BatteryMeterView
android:id="@+id/battery"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
</LinearLayout> </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 androidx.annotation.IdRes;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.BatteryMeterView;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher;
@@ -49,10 +48,7 @@ public class CarStatusBarHeader extends LinearLayout {
float intensity = colorForeground == Color.WHITE ? 0f : 1f; float intensity = colorForeground == Color.WHITE ? 0f : 1f;
Rect tintArea = new Rect(0, 0, 0, 0); Rect tintArea = new Rect(0, 0, 0, 0);
applyDarkness(R.id.battery, tintArea, intensity, colorForeground);
applyDarkness(R.id.clock, 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) { private void applyDarkness(@IdRes int id, Rect tintArea, float intensity, int color) {