From 9661e3b8f39338bd00b161149957f792b211c507 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Wed, 22 Apr 2020 09:12:28 -0400
Subject: [PATCH] Global Actions - Layout tweaks

1. Remove scrollbars from controls
2. Remove top padding and just use insets

Bug: 154696337
Bug: 154673173
Test: visual
Change-Id: Ie188ebabd53cf734396d829b1469735d13377532
---
 packages/SystemUI/res/layout/global_actions_grid_v2.xml | 2 +-
 packages/SystemUI/res/values/dimens.xml                 | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/global_actions_grid_v2.xml b/packages/SystemUI/res/layout/global_actions_grid_v2.xml
index 1c4ec64e9620a..66f57fd6f37c4 100644
--- a/packages/SystemUI/res/layout/global_actions_grid_v2.xml
+++ b/packages/SystemUI/res/layout/global_actions_grid_v2.xml
@@ -14,7 +14,6 @@
       android:theme="@style/qs_theme"
       android:clipChildren="false"
       android:clipToPadding="false"
-      android:layout_marginTop="@dimen/global_actions_top_margin"
       android:layout_marginStart="@dimen/global_actions_side_margin"
   >
     <LinearLayout
@@ -51,6 +50,7 @@
       android:paddingBottom="@dimen/global_actions_grid_container_shadow_offset"
       android:layout_marginBottom="@dimen/global_actions_grid_container_negative_shadow_offset"
       android:orientation="vertical"
+      android:scrollbars="none"
   >
     <LinearLayout
         android:id="@+id/global_actions_grid_root"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 179f8b8ea9f4d..39aa771bc797a 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -993,8 +993,6 @@
     <dimen name="cell_overlay_padding">18dp</dimen>
 
     <!-- Global actions power menu -->
-    <dimen name="global_actions_top_margin">12dp</dimen>
-
     <dimen name="global_actions_panel_width">120dp</dimen>
     <dimen name="global_actions_padding">12dp</dimen>
     <dimen name="global_actions_translate">9dp</dimen>