diff options
author | Danesh M <daneshm90@gmail.com> | 2015-09-28 16:27:25 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-28 16:53:49 -0700 |
commit | e4a62ee23304930700f6935904295350d0883016 (patch) | |
tree | 58d6ab0807918f1a7462e779baee31063bbf3c11 /res | |
parent | 76a7d9c0c0105462415235dc5dab917da9f12b6e (diff) | |
download | packages_apps_Trebuchet-e4a62ee23304930700f6935904295350d0883016.tar.gz packages_apps_Trebuchet-e4a62ee23304930700f6935904295350d0883016.tar.bz2 packages_apps_Trebuchet-e4a62ee23304930700f6935904295350d0883016.zip |
Trebuchet : Fix insets for panelsstaging/catchup
Change-Id: I001a3c87ef2226f6a241b9538c0157b310961978
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout/dynamic_grid_size_screen.xml | 11 | ||||
-rw-r--r-- | res/layout/hidden_folder.xml | 2 | ||||
-rw-r--r-- | res/layout/settings_transitions_screen.xml | 10 | ||||
-rw-r--r-- | res/values/attrs.xml | 14 |
7 files changed, 33 insertions, 10 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 0d6bd5097..877725f5d 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -18,6 +18,7 @@ <com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" + xmlns:insettable="http://schemas.android.com/apk/res-auto" android:id="@+id/launcher" android:layout_width="match_parent" @@ -31,6 +32,7 @@ android:layout_height="match_parent" android:visibility="invisible" android:alpha="1.0" + insettable:layout_ignoreInsets="true" android:clipToPadding="false"> <ImageView diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index e8bac4b36..83c6860cb 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -18,6 +18,7 @@ <com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" + xmlns:insettable="http://schemas.android.com/apk/res-auto" android:id="@+id/launcher" android:layout_width="match_parent" @@ -31,6 +32,7 @@ android:layout_height="match_parent" android:visibility="invisible" android:alpha="1.0" + insettable:layout_ignoreInsets="true" android:clipToPadding="false"> <ImageView diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 6364f09ab..874b504c9 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -18,6 +18,7 @@ <com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" + xmlns:insettable="http://schemas.android.com/apk/res-auto" android:id="@+id/launcher" android:layout_width="match_parent" @@ -31,6 +32,7 @@ android:layout_height="match_parent" android:visibility="invisible" android:alpha="1.0" + insettable:layout_ignoreInsets="true" android:clipToPadding="false"> <ImageView 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> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 0dc34641a..4d1a3c6c6 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -148,7 +148,19 @@ <attr name="sizeToFit" format="boolean" /> </declare-styleable> + <attr name="layout_ignoreInsets" format="boolean" /> + <attr name="layout_ignoreBottomInsets" format="boolean" /> + <attr name="layout_ignoreTopInsets" format="boolean" /> + <declare-styleable name="InsettableFrameLayout_Layout"> - <attr name="layout_ignoreInsets" format="boolean" /> + <attr name="layout_ignoreInsets" /> + <attr name="layout_ignoreTopInsets" /> + <attr name="layout_ignoreBottomInsets" /> + </declare-styleable> + + <declare-styleable name="InsettableLinearLayout_Layout"> + <attr name="layout_ignoreInsets" /> + <attr name="layout_ignoreTopInsets" /> + <attr name="layout_ignoreBottomInsets" /> </declare-styleable> </resources> |