Updating Clings UI

issue: 16127412

Change-Id: Ie5885cabbef086e3b08811da72af88d01c4405e7

2 files changed, 20 insertions, 16 deletions

diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml
index ffae0bead..d1b30a822 100644
--- a/res/layout-land/longpress_cling.xml
+++ b/res/layout-land/longpress_cling.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
     android:id="@+id/longpress_cling"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-    <com.android.launcher3.ClearCircleLayout
-        android:id="@+id/cling_longpress_hole"
+    <Space
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        launcher:holeLocation="page_indicator" />
+        android:layout_height="0dp"
+        android:layout_weight="1" />
 
     <FrameLayout
         android:id="@+id/cling_content"
         android:layout_width="360dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="#FF009688"
-        android:elevation="6dp" />
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/cling_bg" />
 
-</FrameLayout>
\ No newline at end of file
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml
index cc446fb68..4765524f3 100644
--- a/res/layout-land/migration_cling.xml
+++ b/res/layout-land/migration_cling.xml
@@ -58,7 +58,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="sans-serif-condensed"
+            android:fontFamily="sans-serif-medium"
             android:text="@string/migration_cling_title"
             android:textColor="#E1000000"
             android:textSize="20sp" />
@@ -68,7 +68,7 @@
             android:layout_height="wrap_content"
             android:paddingBottom="24dp"
             android:text="@string/migration_cling_description"
-            android:textColor="#E1000000"
+            android:textColor="#99000000"
             android:textSize="16sp" />
 
         <LinearLayout
@@ -76,23 +76,23 @@
             android:layout_height="wrap_content" >
 
             <Button
+                android:id="@+id/cling_dismiss_migration_copy_apps"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:fontFamily="sans-serif-condensed"
-                android:id="@+id/cling_dismiss_migration_copy_apps"
+                android:fontFamily="sans-serif-medium"
                 android:text="@string/migration_cling_copy_apps"
                 android:textColor="#FFFFFFFF"
                 android:textSize="14sp" />
 
             <Button
+                android:id="@+id/cling_dismiss_migration_use_default"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:fontFamily="sans-serif-condensed"
-                android:id="@+id/cling_dismiss_migration_use_default"
+                android:fontFamily="sans-serif-medium"
                 android:text="@string/migration_cling_use_default"
                 android:textColor="#deFFFFFF"
                 android:textSize="14sp" />