Trebuchet : Fix insets for panelsstaging/catchup

Change-Id: I001a3c87ef2226f6a241b9538c0157b310961978

3 files changed, 14 insertions, 9 deletions

diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml
index 8b6ed95ca..aa2b20979 100644
--- a/res/layout/dynamic_grid_size_screen.xml
+++ b/res/layout/dynamic_grid_size_screen.xml
@@ -1,15 +1,15 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.InsettableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:insettable="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal|bottom"
     android:background="@color/settings_bg_color"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/overview_panel_bottom_padding"
-    android:paddingTop="@dimen/overview_panel_bottom_padding"
     android:clickable="true" >
 
     <LinearLayout
         android:id="@+id/dynamic_grid_title"
+        insettable:layout_ignoreBottomInsets="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -36,6 +36,7 @@
     </LinearLayout>
 
     <view
+        insettable:layout_ignoreInsets="true"
         class="com.android.launcher3.DynamicGridSizeFragment$GridSizeView"
         android:id="@+id/dynamic_grid_size_image"
         android:layout_width="150dp"
@@ -44,10 +45,10 @@
         android:layout_marginBottom="@dimen/grid_padding"/>
 
     <ListView
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        insettable:layout_ignoreTopInsets="true"
         android:id="@+id/dynamic_grid_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:listSelector="@android:color/transparent"
         android:splitMotionEvents="false"/>
-</LinearLayout>
+</com.android.launcher3.InsettableLinearLayout>
diff --git a/res/layout/hidden_folder.xml b/res/layout/hidden_folder.xml
index f4e785257..48e6c437d 100644
--- a/res/layout/hidden_folder.xml
+++ b/res/layout/hidden_folder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:insettable="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/settings_bg_color"
@@ -9,6 +10,7 @@
     android:paddingTop="@dimen/overview_panel_bottom_padding"
     android:focusable="true"
     android:focusableInTouchMode="true"
+    insettable:layout_ignoreInsets="true"
     android:clickable="true" >
 
     <RelativeLayout
diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml
index fca36a87f..4ec8ebc66 100644
--- a/res/layout/settings_transitions_screen.xml
+++ b/res/layout/settings_transitions_screen.xml
@@ -1,13 +1,14 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.InsettableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:insettable="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal|bottom"
     android:background="@color/settings_bg_color"
     android:orientation="vertical"
-    android:paddingTop="@dimen/overview_panel_bottom_padding"
     android:clickable="true" >
 
     <RelativeLayout
+        insettable:layout_ignoreBottomInsets="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
@@ -52,6 +53,7 @@
     </RelativeLayout>
 
     <ImageView
+        insettable:layout_ignoreInsets="true"
         android:id="@+id/settings_transition_image"
         android:layout_width="150dp"
         android:layout_height="150dp"
@@ -59,10 +61,10 @@
         android:adjustViewBounds="true" />
 
     <ListView
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        insettable:layout_ignoreTopInsets="true"
         android:id="@+id/settings_transitions_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:listSelector="@android:color/transparent"
         android:splitMotionEvents="false"/>
-</LinearLayout>
+</com.android.launcher3.InsettableLinearLayout>