From 45cab39eea097bf622cd1ed67d91d2336d78663a Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 2 Oct 2013 17:45:32 -0700
Subject: Tweaking the front cling to support more verbose languages. (Bug
 11015051)

---
 res/layout-land/first_run_cling.xml                | 19 ++++++++++++-------
 res/layout-land/workspace_cling.xml                |  6 ++----
 res/layout-port/first_run_cling.xml                | 19 ++++++++++++-------
 res/layout-port/workspace_cling.xml                |  5 ++---
 res/layout/apps_customize_pane.xml                 |  6 ------
 res/values/colors.xml                              |  2 +-
 src/com/android/launcher3/Cling.java               |  2 +-
 src/com/android/launcher3/WidgetPreviewLoader.java |  2 +-
 8 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/res/layout-land/first_run_cling.xml b/res/layout-land/first_run_cling.xml
index 3b21e14f6..9baee64b7 100644
--- a/res/layout-land/first_run_cling.xml
+++ b/res/layout-land/first_run_cling.xml
@@ -25,26 +25,31 @@
         android:layout_height="match_parent">
         <LinearLayout
             android:id="@+id/bubble_content"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
             android:orientation="vertical">
             <TextView
                 style="@style/ClingAltTitleText"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="10dp"
                 android:text="@string/first_run_cling_title"
                 android:textColor="#FFFFFFFF"
-                android:textSize="30sp" />
+                android:textSize="30sp"
+                android:gravity="center" />
             <TextView
                 style="@style/ClingAltTitleText"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/first_run_cling_description"
                 android:textColor="#80000000"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:gravity="center" />
         </LinearLayout>
         <TextView
             style="@style/ClingHintText"
@@ -53,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_marginEnd="10dp"
-            android:layout_marginTop="80dp"
+            android:layout_marginTop="65dp"
             android:visibility="gone"
             android:drawableTop="@drawable/cling_arrow_up"
             android:drawablePadding="5dp"
@@ -76,7 +81,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_marginEnd="10dp"
-            android:layout_marginBottom="100dp"
+            android:layout_marginBottom="85dp"
             android:drawableEnd="@drawable/cling_arrow_right"
             android:drawablePadding="5dp"
             android:text="@string/first_run_cling_create_screens_hint" />
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml
index 08fb8cf23..db33db06f 100644
--- a/res/layout-land/workspace_cling.xml
+++ b/res/layout-land/workspace_cling.xml
@@ -25,13 +25,11 @@
         android:layout_height="match_parent"
         android:layout_marginStart="25dp"
         android:layout_marginEnd="25dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="100dp">
+        android:layout_marginTop="310dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginBottom="40dp"
+            android:layout_gravity="top"
             android:orientation="vertical">
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml
index 3b21e14f6..9baee64b7 100644
--- a/res/layout-port/first_run_cling.xml
+++ b/res/layout-port/first_run_cling.xml
@@ -25,26 +25,31 @@
         android:layout_height="match_parent">
         <LinearLayout
             android:id="@+id/bubble_content"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
             android:orientation="vertical">
             <TextView
                 style="@style/ClingAltTitleText"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="10dp"
                 android:text="@string/first_run_cling_title"
                 android:textColor="#FFFFFFFF"
-                android:textSize="30sp" />
+                android:textSize="30sp"
+                android:gravity="center" />
             <TextView
                 style="@style/ClingAltTitleText"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/first_run_cling_description"
                 android:textColor="#80000000"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:gravity="center" />
         </LinearLayout>
         <TextView
             style="@style/ClingHintText"
@@ -53,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_marginEnd="10dp"
-            android:layout_marginTop="80dp"
+            android:layout_marginTop="65dp"
             android:visibility="gone"
             android:drawableTop="@drawable/cling_arrow_up"
             android:drawablePadding="5dp"
@@ -76,7 +81,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_marginEnd="10dp"
-            android:layout_marginBottom="100dp"
+            android:layout_marginBottom="85dp"
             android:drawableEnd="@drawable/cling_arrow_right"
             android:drawablePadding="5dp"
             android:text="@string/first_run_cling_create_screens_hint" />
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index 38d385896..db33db06f 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -25,12 +25,11 @@
         android:layout_height="match_parent"
         android:layout_marginStart="25dp"
         android:layout_marginEnd="25dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="120dp">
+        android:layout_marginTop="310dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
+            android:layout_gravity="top"
             android:orientation="vertical">
             <ImageView
                 android:layout_width="wrap_content"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index e4886017c..11a938fbb 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -78,10 +78,4 @@
                 android:layout_marginBottom="@dimen/apps_customize_page_indicator_margin" />
         </FrameLayout>
     </LinearLayout>
-
-    <include layout="@layout/all_apps_cling"
-        android:id="@+id/all_apps_cling"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone" />
 </com.android.launcher3.AppsCustomizeTabHost>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e4278d991..dc35a3f68 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,5 +36,5 @@
     <color name="folder_items_text_color">#FF333333</color>
     <color name="outline_color">#FFFFFFFF</color>
     
-    <color name="first_run_cling_circle_background_color">#FF8BB4E9</color>
+    <color name="first_run_cling_circle_background_color">#64b1ea</color>
 </resources>
diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java
index 2656ad6a8..de92605d9 100644
--- a/src/com/android/launcher3/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -327,7 +327,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnLongClickLi
             }
             if (mDrawIdentifier.equals(FIRST_RUN_PORTRAIT) ||
                     mDrawIdentifier.equals(FIRST_RUN_LANDSCAPE)) {
-                // Draw the white circle
+                // Draw the circle
                 View bubbleContent = findViewById(R.id.bubble_content);
                 Rect bubbleRect = new Rect();
                 bubbleContent.getGlobalVisibleRect(bubbleRect);
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index b1bb1e855..956fd99cd 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -469,7 +469,7 @@ public class WidgetPreviewLoader {
                     .getIntrinsicWidth();
             final int previewDrawableHeight = previewDrawable
                     .getIntrinsicHeight();
-            previewWidth = previewDrawableWidth * cellHSpan; // subtract 2 dips
+            previewWidth = previewDrawableWidth * cellHSpan;
             previewHeight = previewDrawableHeight * cellVSpan;
 
             defaultPreview = Bitmap.createBitmap(previewWidth, previewHeight,
-- 
cgit v1.2.3