diff options
author | Winson Chung <winsonc@google.com> | 2014-01-15 14:31:59 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2014-01-16 14:26:07 -0800 |
commit | 205cd7727f3bd8b65892c580e6f243464878fe6e (patch) | |
tree | 603e323173787cae0bf5c4d882b73265c00bd904 /res/layout-sw720dp | |
parent | 230cbf831cbbe8aaa6eaff976f755a8adf5e1708 (diff) | |
download | android_packages_apps_Trebuchet-205cd7727f3bd8b65892c580e6f243464878fe6e.tar.gz android_packages_apps_Trebuchet-205cd7727f3bd8b65892c580e6f243464878fe6e.tar.bz2 android_packages_apps_Trebuchet-205cd7727f3bd8b65892c580e6f243464878fe6e.zip |
Updating Tablet clings. (Bug 11973614)
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
Diffstat (limited to 'res/layout-sw720dp')
-rw-r--r-- | res/layout-sw720dp/first_run_cling.xml | 98 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 16 | ||||
-rw-r--r-- | res/layout-sw720dp/migration_workspace_cling.xml | 70 |
3 files changed, 183 insertions, 1 deletions
diff --git a/res/layout-sw720dp/first_run_cling.xml b/res/layout-sw720dp/first_run_cling.xml new file mode 100644 index 000000000..c43d8d32e --- /dev/null +++ b/res/layout-sw720dp/first_run_cling.xml @@ -0,0 +1,98 @@ +<?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="first_run_portrait"> + <FrameLayout + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:id="@+id/bubble_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="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:gravity="center" /> + <TextView + style="@style/ClingAltText" + 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:gravity="center" /> + </LinearLayout> + <TextView + style="@style/ClingHintText" + android:id="@+id/search_bar_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top|end" + android:layout_marginEnd="120dp" + android:layout_marginTop="80dp" + android:gravity="center_horizontal" + android:maxWidth="160dp" + android:visibility="gone" + android:drawableTop="@drawable/cling_arrow_up" + android:drawablePadding="10dp" + android:text="@string/first_run_cling_search_bar_hint" /> + <TextView + style="@style/ClingHintText" + android:id="@+id/custom_content_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|start" + android:layout_marginStart="30dp" + android:gravity="start" + android:maxWidth="160dp" + android:visibility="gone" + android:drawableStart="@drawable/cling_arrow_start" + android:drawablePadding="10dp" + android:text="@string/first_run_cling_custom_content_hint" /> + <TextView + style="@style/ClingHintText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="30dp" + android:maxWidth="180dp" + android:drawableEnd="@drawable/cling_arrow_end" + android:drawablePadding="10dp" + android:text="@string/first_run_cling_create_screens_hint" /> + </FrameLayout> + <Button + style="@style/ClingButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="30dp" + android:layout_marginEnd="40dp" + android:layout_gravity="bottom|end" + android:onClick="dismissFirstRunCling" /> +</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 64b0fa0d6..685d03c6f 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -64,17 +64,31 @@ <!-- 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. --> + <com.android.launcher3.ScrimView + 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" 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" 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/layout-sw720dp/migration_workspace_cling.xml b/res/layout-sw720dp/migration_workspace_cling.xml new file mode 100644 index 000000000..eb13137a1 --- /dev/null +++ b/res/layout-sw720dp/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_large_portrait"> + <FrameLayout + android:id="@+id/content" + android:layout_width="480dp" + android:layout_height="match_parent" + android:layout_gravity="bottom|center_horizontal"> + <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:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginRight="4dp" + android:paddingLeft="20dp" + android:paddingRight="20dp" + 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/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" /> + <Button + style="@style/ClingButton" + android:id="@+id/dismiss_migration_workspace_cling_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:onClick="dismissMigrationWorkspaceCling" /> + </LinearLayout> + </FrameLayout> +</com.android.launcher3.Cling> |