diff options
author | Winson Chung <winsonc@google.com> | 2014-01-08 14:04:34 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2014-01-10 22:28:16 +0000 |
commit | a694524047fda0a51dede4eefb1201a598d2d3a7 (patch) | |
tree | d80c9f4eb0fa253e2dfc297a3a82069cf571dc89 /res | |
parent | b54a5989a21bef4e6bac304591ca4030bfbe709d (diff) | |
download | android_packages_apps_Trebuchet-a694524047fda0a51dede4eefb1201a598d2d3a7.tar.gz android_packages_apps_Trebuchet-a694524047fda0a51dede4eefb1201a598d2d3a7.tar.bz2 android_packages_apps_Trebuchet-a694524047fda0a51dede4eefb1201a598d2d3a7.zip |
Adding migration Clings. (Bug 11973614)
- Refactoring Launcher cling code out to LauncherClings.
Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-port/launcher.xml | 10 | ||||
-rw-r--r-- | res/layout-port/migration_cling.xml | 93 | ||||
-rw-r--r-- | res/layout-port/migration_workspace_cling.xml | 70 | ||||
-rw-r--r-- | res/values/strings.xml | 8 |
4 files changed, 181 insertions, 0 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 2b3cf81a4..74005348c 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -73,6 +73,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> + <include layout="@layout/migration_cling" + android:id="@+id/migration_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/migration_workspace_cling" + android:id="@+id/migration_workspace_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <include layout="@layout/workspace_cling" android:id="@+id/workspace_cling" android:layout_width="match_parent" diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml new file mode 100644 index 000000000..36bbab8da --- /dev/null +++ b/res/layout-port/migration_cling.xml @@ -0,0 +1,93 @@ +<?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_portrait"> + <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: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" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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: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_marginStart="25dp" + android:layout_marginEnd="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-port/migration_workspace_cling.xml b/res/layout-port/migration_workspace_cling.xml new file mode 100644 index 000000000..bc5e22ff1 --- /dev/null +++ b/res/layout-port/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_portrait"> + <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/values/strings.xml b/res/values/strings.xml index 361be7b3c..09120d086 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -216,6 +216,14 @@ s --> <string name="first_run_cling_search_bar_hint"></string> <!-- 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> + <!-- The description of what migration does [CHAR_LIMIT=60] --> + <string name="migration_cling_description">Import apps 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> + <!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] --> + <string name="migration_cling_use_default">USE DEFAULT</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] --> |