Merge "Center GlobalActionsDialog when it does not take up the full screen." into qt-dev

3 files changed, 6 insertions, 9 deletions

diff --git a/packages/SystemUI/res/layout-land/global_actions_grid.xml b/packages/SystemUI/res/layout-land/global_actions_grid.xml
index 86b103d63f1a..4619430d6b47 100644
--- a/packages/SystemUI/res/layout-land/global_actions_grid.xml
+++ b/packages/SystemUI/res/layout-land/global_actions_grid.xml
@@ -6,16 +6,15 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:theme="@style/qs_theme"
-    android:gravity="right"
+    android:gravity="right | center_vertical"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:paddingRight="@dimen/global_actions_grid_container_shadow_offset"
     android:layout_marginRight="@dimen/global_actions_grid_container_negative_shadow_offset"
 >
     <LinearLayout
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:gravity="top|right"
         android:orientation="vertical"
         android:layout_marginRight="@dimen/global_actions_grid_container_bottom_margin"
         android:clipChildren="false"
diff --git a/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml b/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml
index 4c3fcc0c87a0..4ece03b9b8e3 100644
--- a/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml
+++ b/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml
@@ -6,16 +6,15 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:theme="@style/qs_theme"
-    android:gravity="left"
+    android:gravity="left | center_vertical"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:paddingLeft="@dimen/global_actions_grid_container_shadow_offset"
     android:layout_marginLeft="@dimen/global_actions_grid_container_negative_shadow_offset"
 >
     <LinearLayout
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:gravity="bottom|left"
         android:padding="0dp"
         android:orientation="vertical"
         android:clipChildren="false"
diff --git a/packages/SystemUI/res/layout/global_actions_grid.xml b/packages/SystemUI/res/layout/global_actions_grid.xml
index 43e6b49b4248..3928062e43d2 100644
--- a/packages/SystemUI/res/layout/global_actions_grid.xml
+++ b/packages/SystemUI/res/layout/global_actions_grid.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:theme="@style/qs_theme"
-    android:gravity="bottom"
+    android:gravity="bottom | center_horizontal"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:paddingBottom="@dimen/global_actions_grid_container_shadow_offset"
@@ -14,8 +14,7 @@
 >
     <LinearLayout
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:gravity="bottom | right"
+        android:layout_width="wrap_content"
         android:layoutDirection="ltr"
         android:clipChildren="false"
         android:clipToPadding="false"