From 85e585f9d5242757b1f15e0a206d46d1f89587db Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Tue, 15 Jun 2021 13:40:27 -0400
Subject: [PATCH] Make sure that icons are right aligned in QQS

In QQS with a center inset, the right side container is 0dp to take all
of the space. As we want its content right aligned, we put it in a
FrameLayout.

This has no effect when there's no inset.

Test: manual with and without inset
Fixes: 191039767
Change-Id: I8b70777ee79f8647f679ffb6a9a4703e50403dcd
---
 .../SystemUI/res/layout/quick_qs_status_icons.xml     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
index c88703dabeeac..5b9ca1b261589 100644
--- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
@@ -59,11 +59,16 @@
         android:visibility="gone"
         />
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/rightLayout"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical|end"
+        android:gravity="end"
+        >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|end"
         >
         <com.android.systemui.statusbar.phone.StatusIconContainer
             android:id="@+id/statusIcons"
@@ -80,4 +85,6 @@
             android:paddingEnd="2dp" />
 
     </LinearLayout>
+    </FrameLayout>
+
 </LinearLayout>