diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/folder_cling.xml | 46 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 5 | ||||
-rw-r--r-- | res/layout-port/folder_cling.xml | 42 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
-rw-r--r-- | res/values/colors.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 8 |
6 files changed, 49 insertions, 60 deletions
diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml index 171e39554..1f4a115af 100644 --- a/res/layout-land/folder_cling.xml +++ b/res/layout-land/folder_cling.xml @@ -20,39 +20,29 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="10dp" - android:layout_marginEnd="10dp" - android:layout_marginTop="40dp" - android:layout_marginBottom="20dp"> + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - <LinearLayout + 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: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="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/cling_arrow_down" /> + android:text="@string/folder_cling_create_folder" /> </LinearLayout> </FrameLayout> <Button diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 2b9a9f3e8..86fc1edad 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -57,6 +57,11 @@ <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on top of that view. --> + <FrameLayout + android:id="@+id/cling_scrim" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <include layout="@layout/first_run_cling" android:id="@+id/first_run_cling" android:layout_width="match_parent" diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml index bd4b5e2b1..1f4a115af 100644 --- a/res/layout-port/folder_cling.xml +++ b/res/layout-port/folder_cling.xml @@ -20,39 +20,29 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - <LinearLayout + 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: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="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/cling_arrow_down" /> + android:text="@string/folder_cling_create_folder" /> </LinearLayout> </FrameLayout> <Button diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index faef7a594..ef2f3ace1 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -64,6 +64,11 @@ <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on top of that view. --> + <FrameLayout + android:id="@+id/cling_scrim" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <include layout="@layout/first_run_cling" android:id="@+id/first_run_cling" android:layout_width="match_parent" @@ -74,7 +79,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> - <include layout="@layout/folder_cling" android:id="@+id/folder_cling" android:layout_width="match_parent" diff --git a/res/values/colors.xml b/res/values/colors.xml index 43a856d9f..e4278d991 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">#FF83AEE8</color> + <color name="first_run_cling_circle_background_color">#FF8BB4E9</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6c05f7d29..ac372fd72 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] --> @@ -238,15 +238,15 @@ s --> <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> <string name="workspace_cling_title">Organize your space</string> <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> - <string name="workspace_cling_move_item">Touch & hold background to manage wallpaper, widgets and settings</string> + <string name="workspace_cling_move_item">Touch & hold background to manage wallpaper, widgets and settings.</string> <!-- The title text for the All Apps cling [CHAR_LIMIT=none] --> <string name="all_apps_cling_title">Choose some apps</string> <!-- The description of how to pick up and add an item to the workspace [CHAR_LIMIT=none] --> <string name="all_apps_cling_add_item">To add an app to your Home screen, touch & hold it.</string> <!-- The title text for the Folder cling [CHAR_LIMIT=none] --> - <string name="folder_cling_title">Create new folders for your apps</string> + <string name="folder_cling_title">Here\'s a folder</string> <!-- The description of how to create a folder [CHAR_LIMIT=none] --> - <string name="folder_cling_create_folder">Touch & hold an app, then move it on top of another app icon</string> + <string name="folder_cling_create_folder">To create one like this, touch & hold an app, then move it over another.</string> <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] --> <string name="cling_dismiss">OK</string> <!-- Error message on dummy custom cling layout [DO NOT TRANSLATE] --> |