diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/on_boarding_welcome.png | bin | 0 -> 22423 bytes | |||
-rw-r--r-- | res/drawable-mdpi/on_boarding_welcome.png | bin | 0 -> 15325 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/on_boarding_welcome.png | bin | 0 -> 34253 bytes | |||
-rw-r--r-- | res/layout-land/migration_cling.xml | 100 | ||||
-rw-r--r-- | res/layout-land/migration_workspace_cling.xml | 70 | ||||
-rw-r--r-- | res/layout-port/migration_cling.xml | 29 | ||||
-rw-r--r-- | res/mipmap-xxhdpi/on_boarding_welcome.png | bin | 0 -> 50862 bytes | |||
-rw-r--r-- | res/values/strings.xml | 10 |
8 files changed, 193 insertions, 16 deletions
diff --git a/res/drawable-hdpi/on_boarding_welcome.png b/res/drawable-hdpi/on_boarding_welcome.png Binary files differnew file mode 100644 index 000000000..852a0cb13 --- /dev/null +++ b/res/drawable-hdpi/on_boarding_welcome.png diff --git a/res/drawable-mdpi/on_boarding_welcome.png b/res/drawable-mdpi/on_boarding_welcome.png Binary files differnew file mode 100644 index 000000000..1d12e8362 --- /dev/null +++ b/res/drawable-mdpi/on_boarding_welcome.png diff --git a/res/drawable-xhdpi/on_boarding_welcome.png b/res/drawable-xhdpi/on_boarding_welcome.png Binary files differnew file mode 100644 index 000000000..8c101e0db --- /dev/null +++ b/res/drawable-xhdpi/on_boarding_welcome.png diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml new file mode 100644 index 000000000..343f43f1f --- /dev/null +++ b/res/layout-land/migration_cling.xml @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.launcher3.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:drawIdentifier="migration_landscape"> + <FrameLayout + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:orientation="vertical"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:gravity="center" + android:text="@string/first_run_cling_title" + android:textSize="42dp" + android:textColor="#FFffffff" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="0dp" + android:layout_gravity="center_horizontal" + android:src="@drawable/on_boarding_welcome" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:src="@drawable/cling_arrow_up" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="25dp" + android:layout_marginRight="25dp" + android:paddingLeft="25dp" + android:paddingRight="25dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/migration_cling_title" /> + <TextView + style="@style/ClingText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/migration_cling_description" /> + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginLeft="25dp" + android:layout_marginRight="25dp" + android:layout_marginBottom="25dp" + android:orientation="vertical"> + <Button + style="@style/ClingButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/migration_cling_copy_apps" + android:onClick="dismissMigrationClingCopyApps" /> + <Button + style="@style/ClingButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/migration_cling_use_default" + android:onClick="dismissMigrationClingUseDefault" /> + </LinearLayout> + </FrameLayout> +</com.android.launcher3.Cling> diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml new file mode 100644 index 000000000..bf7075b3d --- /dev/null +++ b/res/layout-land/migration_workspace_cling.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.launcher3.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:drawIdentifier="migration_workspace_landscape"> + <FrameLayout + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:id="@+id/migration_workspace_cling_bubble" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:orientation="vertical"> + <LinearLayout + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="@drawable/cling"> + <TextView + style="@style/ClingTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:src="@drawable/cling_arrow_down" /> + </LinearLayout> + + <Button + style="@style/ClingButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="15dp" + android:layout_marginRight="20dp" + android:layout_gravity="bottom|right" + android:onClick="dismissMigrationWorkspaceCling" /> + </FrameLayout> +</com.android.launcher3.Cling> diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml index 36bbab8da..1bffe6c82 100644 --- a/res/layout-port/migration_cling.xml +++ b/res/layout-port/migration_cling.xml @@ -29,17 +29,22 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" android:orientation="vertical"> <TextView - style="@style/ClingAltTitleText" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:layout_marginBottom="10dp" android:gravity="center" - android:text="@string/first_run_cling_title" /> + android:text="@string/first_run_cling_title" + android:textSize="42dp" + android:textColor="#FFffffff" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="0dp" + android:layout_gravity="center_horizontal" + android:src="@drawable/on_boarding_welcome" /> <ImageView android:layout_width="wrap_content" @@ -47,12 +52,14 @@ android:layout_gravity="center_horizontal" android:src="@drawable/cling_arrow_up" /> <LinearLayout - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginLeft="25dp" + android:layout_marginRight="25dp" + android:paddingLeft="25dp" + android:paddingRight="25dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" android:orientation="vertical" android:background="@drawable/cling"> <TextView @@ -72,8 +79,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" + android:layout_marginLeft="25dp" + android:layout_marginRight="25dp" android:layout_marginBottom="25dp" android:orientation="vertical"> <Button diff --git a/res/mipmap-xxhdpi/on_boarding_welcome.png b/res/mipmap-xxhdpi/on_boarding_welcome.png Binary files differnew file mode 100644 index 000000000..7b11dea0e --- /dev/null +++ b/res/mipmap-xxhdpi/on_boarding_welcome.png diff --git a/res/values/strings.xml b/res/values/strings.xml index 09120d086..b25b4bb3d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -207,7 +207,7 @@ s --> <!-- Clings --> <!-- The title text for the workspace cling [CHAR_LIMIT=30] --> - <string name="first_run_cling_title">Welcome!</string> + <string name="first_run_cling_title">Welcome</string> <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_description">Make yourself at home.</string> <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> @@ -217,13 +217,13 @@ s --> <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string> <!-- The title text for the migration cling [CHAR_LIMIT=30] --> - <string name="migration_cling_title">Copy your apps?</string> + <string name="migration_cling_title">Copy your app icons</string> <!-- The description of what migration does [CHAR_LIMIT=60] --> - <string name="migration_cling_description">Import apps and folders from your old Home screens?</string> + <string name="migration_cling_description">Import icons and folders from your old Home screens?</string> <!-- The description of the button to migrate apps from another launcher [CHAR_LIMIT=30] --> - <string name="migration_cling_copy_apps">COPY APPS</string> + <string name="migration_cling_copy_apps">COPY ICONS</string> <!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] --> - <string name="migration_cling_use_default">USE DEFAULT</string> + <string name="migration_cling_use_default">START FRESH</string> <!-- The title text for the workspace cling [CHAR_LIMIT=30] --> <string name="workspace_cling_title">Organize your space</string> <!-- The description of how to use the workspace [CHAR_LIMIT=70] --> |