diff options
author | Mario Bertschler <bmario@google.com> | 2017-05-11 10:45:20 -0700 |
---|---|---|
committer | Mario Bertschler <bmario@google.com> | 2017-05-16 16:13:11 -0700 |
commit | 8acf8b506d8c5db2ddcac825a24d0a3bda9fe100 (patch) | |
tree | 053d15104fe183ce00f9d260f4e009cf380f0595 /res | |
parent | 7f91393c5518584fd48913a16f2dd2759bad31ea (diff) | |
download | android_packages_apps_Trebuchet-8acf8b506d8c5db2ddcac825a24d0a3bda9fe100.tar.gz android_packages_apps_Trebuchet-8acf8b506d8c5db2ddcac825a24d0a3bda9fe100.tar.bz2 android_packages_apps_Trebuchet-8acf8b506d8c5db2ddcac825a24d0a3bda9fe100.zip |
Design adjustments for transition from workspace to
All apps.
Change-Id: I0aeb8da7f0eebdf677ca7bda06fb538f08a6ee51
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout/gradient_scrim.xml | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 565728cdc..1e82f2276 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -32,8 +32,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/gradient_scrim" /> - <!-- The workspace contains 5 screens of cells --> <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.Workspace @@ -44,6 +42,8 @@ android:layout_gravity="center" launcher:pageIndicator="@id/page_indicator" /> + <include layout="@layout/gradient_scrim" /> + <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" android:id="@+id/hotseat" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index eccb824a8..c15e53d8d 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -33,8 +33,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/gradient_scrim" /> - <!-- The workspace contains 5 screens of cells --> <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.Workspace @@ -46,6 +44,8 @@ launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> + <include layout="@layout/gradient_scrim" /> + <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" android:id="@+id/hotseat" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 7fad517b4..c516c4697 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -32,8 +32,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/gradient_scrim" /> - <!-- The workspace contains 5 screens of cells --> <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.Workspace @@ -45,6 +43,8 @@ launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> + <include layout="@layout/gradient_scrim" /> + <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" android:id="@+id/hotseat" diff --git a/res/layout/gradient_scrim.xml b/res/layout/gradient_scrim.xml index 02c39eb7d..c40c5fc0c 100644 --- a/res/layout/gradient_scrim.xml +++ b/res/layout/gradient_scrim.xml @@ -15,7 +15,7 @@ --> <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <com.android.launcher3.graphics.RadialGradientView + <com.android.launcher3.graphics.GradientView android:id="@+id/gradient_bg" android:layout_width="match_parent" android:layout_height="match_parent" |