PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

am 1f24b14a: am 45cab39e: Tweaking the front cling to support more verbose languages. (Bug 11015051)

Browse Source 
* commit '1f24b14a6af526c7d703903a96ed3277c7d9889e':
  Tweaking the front cling to support more verbose languages. (Bug 11015051)
This commit is contained in:
Winson Chung
2013-10-03 15:03:49 -07:00
committed by Android Git Automerger
parent 397114af2c 1f24b14a6a
commit dd610cac90
8 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout-land/first_run_cling.xml
+12 -7
View File
@@ -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" />
res/layout-land/workspace_cling.xml
+2 -4
View File
@@ -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"
res/layout-port/first_run_cling.xml
+12 -7
View File
@@ -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" />
res/layout-port/workspace_cling.xml
+2 -3
View File
@@ -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"
res/layout/apps_customize_pane.xml
-6
View File
@@ -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>
res/values/colors.xml
+1 -1
View File
@@ -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>
src/com/android/launcher3/Cling.java
+1 -1
View File
@@ -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);
src/com/android/launcher3/WidgetPreviewLoader.java
+1 -1
View File
@@ -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,