diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-28 23:37:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-28 23:37:11 +0000 |
commit | f659c985e6ba9c7866d45b3865325290172062b4 (patch) | |
tree | 6850bd2ae734a1c844735fb40f6c245320b04608 | |
parent | bc927f9c24001e250622ca9a2547ee5b65baef58 (diff) | |
parent | 75f8adf06c66b3b6f8f0ad3da62d7717c4a6e3a8 (diff) | |
download | android_packages_apps_Trebuchet-f659c985e6ba9c7866d45b3865325290172062b4.tar.gz android_packages_apps_Trebuchet-f659c985e6ba9c7866d45b3865325290172062b4.tar.bz2 android_packages_apps_Trebuchet-f659c985e6ba9c7866d45b3865325290172062b4.zip |
Merge "Fixing insets of launcher clings" into ub-now-queens
-rw-r--r-- | res/layout-land/longpress_cling.xml | 3 | ||||
-rw-r--r-- | res/layout-land/migration_cling.xml | 2 | ||||
-rw-r--r-- | res/layout-port/longpress_cling.xml | 3 | ||||
-rw-r--r-- | res/layout-port/migration_cling.xml | 2 | ||||
-rw-r--r-- | res/layout-sw600dp-port/longpress_cling.xml | 3 |
5 files changed, 10 insertions, 3 deletions
diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml index 93bbc077a..9672dd8a0 100644 --- a/res/layout-land/longpress_cling.xml +++ b/res/layout-land/longpress_cling.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/longpress_cling" android:layout_width="match_parent" android:layout_height="match_parent" + launcher:layout_ignoreInsets="true" android:background="@color/cling_scrim_background" android:orientation="vertical" > diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml index 307cba8a8..db93da87a 100644 --- a/res/layout-land/migration_cling.xml +++ b/res/layout-land/migration_cling.xml @@ -15,9 +15,11 @@ limitations under the License. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/migration_cling" android:layout_width="match_parent" android:layout_height="match_parent" + launcher:layout_ignoreInsets="true" android:background="#FF009688" android:baselineAligned="false" android:gravity="center_vertical" > diff --git a/res/layout-port/longpress_cling.xml b/res/layout-port/longpress_cling.xml index 8e35f5c1a..c0b526713 100644 --- a/res/layout-port/longpress_cling.xml +++ b/res/layout-port/longpress_cling.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/longpress_cling" android:layout_width="match_parent" android:layout_height="match_parent" + launcher:layout_ignoreInsets="true" android:background="@color/cling_scrim_background" > <FrameLayout diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml index dde8dbcdb..81689d38b 100644 --- a/res/layout-port/migration_cling.xml +++ b/res/layout-port/migration_cling.xml @@ -15,9 +15,11 @@ limitations under the License. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/migration_cling" android:layout_width="match_parent" android:layout_height="match_parent" + launcher:layout_ignoreInsets="true" android:background="#FF009688" > <RelativeLayout diff --git a/res/layout-sw600dp-port/longpress_cling.xml b/res/layout-sw600dp-port/longpress_cling.xml index b42d697a5..c4573d535 100644 --- a/res/layout-sw600dp-port/longpress_cling.xml +++ b/res/layout-sw600dp-port/longpress_cling.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:id="@+id/longpress_cling" android:layout_width="match_parent" android:layout_height="match_parent" + launcher:layout_ignoreInsets="true" android:background="@color/cling_scrim_background" android:orientation="vertical" > |