From 9d1274bda504a92d6b583f9ac9572075bd767bfa Mon Sep 17 00:00:00 2001
From: Roy Chou <juchengchou@google.com>
Date: Fri, 14 Jul 2023 06:07:28 +0000
Subject: [PATCH] fix(non linear font scaling): battery icon in qqs status bar
 might be cut off

As the screenshot in b/291168770, when qqs status bar contains too much system icons and the container can not display all icons, the battery icon view might be cut off or even disappear. Since originally the battery icon view has higher priority and should stick to the right side of the container, we change the system icons container layout to ensure the battery icon view is placed properly, then using the remain space for the other system icons displaying.

Bug: 291168770
Test: manually - attached screenshot in bug
Change-Id: Id36f6cb0aa336dbbb4ca45c24879be3e4bc1e876
---
 packages/SystemUI/res/layout/combined_qs_header.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml
index f3a6bbeaaf0e0..12f13e9a21385 100644
--- a/packages/SystemUI/res/layout/combined_qs_header.xml
+++ b/packages/SystemUI/res/layout/combined_qs_header.xml
@@ -133,7 +133,8 @@ frame when animating QS <-> QQS transition
 
         <com.android.systemui.statusbar.phone.StatusIconContainer
             android:id="@+id/statusIcons"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:paddingEnd="@dimen/signal_cluster_battery_padding" />