diff options
author | Tony <twickham@google.com> | 2017-08-03 17:06:19 -0700 |
---|---|---|
committer | Tony <twickham@google.com> | 2017-08-03 17:06:19 -0700 |
commit | 3b7c865e04216ac22e9bd6778f307c5a6b8d4171 (patch) | |
tree | 08e04d481548ae3daee0e89ddf72a8d913048950 /res | |
parent | 1ab03c6b2beb5da9178ac0aa93659a135b574f1f (diff) | |
parent | 2bc5c995f6d75faab7e4fd1b40cbe25e61209b1f (diff) | |
download | android_packages_apps_Trebuchet-3b7c865e04216ac22e9bd6778f307c5a6b8d4171.tar.gz android_packages_apps_Trebuchet-3b7c865e04216ac22e9bd6778f307c5a6b8d4171.tar.bz2 android_packages_apps_Trebuchet-3b7c865e04216ac22e9bd6778f307c5a6b8d4171.zip |
Merge commit 'refs/changes/84/2659484/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-860fd7dd-f3a3-4500-8fc2-78d473322b94
Change-Id: I0b39a20cee47d4aba4a033196db3df78b2357b7b
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout/gradient_bg.xml | 24 |
4 files changed, 27 insertions, 18 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index dab074391..ac440fc01 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -42,12 +42,7 @@ android:layout_gravity="center" launcher:pageIndicator="@id/page_indicator" /> - <com.android.launcher3.graphics.GradientView - android:id="@+id/gradient_bg" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - launcher:layout_ignoreInsets="true"/> + <include layout="@layout/gradient_bg" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index bace51aac..c41a6e380 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -44,12 +44,7 @@ launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> - <com.android.launcher3.graphics.GradientView - android:id="@+id/gradient_bg" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - launcher:layout_ignoreInsets="true"/> + <include layout="@layout/gradient_bg" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 18d235c1d..03e42bc1d 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -43,12 +43,7 @@ launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> - <com.android.launcher3.graphics.GradientView - android:id="@+id/gradient_bg" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - launcher:layout_ignoreInsets="true"/> + <include layout="@layout/gradient_bg" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout/gradient_bg.xml b/res/layout/gradient_bg.xml new file mode 100644 index 000000000..db448d781 --- /dev/null +++ b/res/layout/gradient_bg.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.android.launcher3.graphics.GradientView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" + android:id="@+id/gradient_bg" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + launcher:layout_ignoreInsets="true" />
\ No newline at end of file |