diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-01 19:08:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 19:08:18 +0000 |
| commit | 8cacf102eb0bd0d84f781b2db4722590398c0ed9 (patch) | |
| tree | 8ebb233d98eb99aa7d9301d9699a67260ac0c188 | |
| parent | e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f (diff) | |
| parent | 16de08e83e1efdcd5a3599a04692a6968dddf45a (diff) | |
| download | android_packages_apps_Trebuchet-8cacf102eb0bd0d84f781b2db4722590398c0ed9.tar.gz android_packages_apps_Trebuchet-8cacf102eb0bd0d84f781b2db4722590398c0ed9.tar.bz2 android_packages_apps_Trebuchet-8cacf102eb0bd0d84f781b2db4722590398c0ed9.zip | |
Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose
| -rw-r--r-- | res/layout-land/folder_cling.xml | 37 | ||||
| -rw-r--r-- | res/layout-port/folder_cling.xml | 37 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 47 insertions, 29 deletions
diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml index 1f4a115af..86286d71b 100644 --- a/res/layout-land/folder_cling.xml +++ b/res/layout-land/folder_cling.xml @@ -27,22 +27,31 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/folder_cling_title" - android:text="@string/folder_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/folder_cling_create_folder" + android:orientation="vertical"> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/folder_cling_create_folder" /> + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/folder_cling_create_folder" /> + </LinearLayout> + <ImageView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/cling_arrow_down" /> </LinearLayout> </FrameLayout> <Button diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml index 1f4a115af..86286d71b 100644 --- a/res/layout-port/folder_cling.xml +++ b/res/layout-port/folder_cling.xml @@ -27,22 +27,31 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/folder_cling_title" - android:text="@string/folder_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/folder_cling_create_folder" + android:orientation="vertical"> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/folder_cling_create_folder" /> + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/folder_cling_create_folder" /> + </LinearLayout> + <ImageView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/cling_arrow_down" /> </LinearLayout> </FrameLayout> <Button diff --git a/res/values/strings.xml b/res/values/strings.xml index ac372fd72..dfccd981b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -228,7 +228,7 @@ s --> <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> <string name="first_run_cling_title">Welcome!</string> <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> - <string name="first_run_cling_description">Make yourself at Home.</string> + <string name="first_run_cling_description">Make yourself at home.</string> <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> <string name="first_run_cling_custom_content_hint"></string> <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> |