diff options
author | Winson Chung <winsonc@google.com> | 2013-09-18 18:26:31 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-20 17:22:05 -0700 |
commit | af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0 (patch) | |
tree | 0f36e6018c23e408c1dd846a9ef5ce063478fb65 /res/layout-port | |
parent | 477828cc83b60a17eb9b6fc8ee08b4abbc3d2fb1 (diff) | |
download | android_packages_apps_Trebuchet-af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0.tar.gz android_packages_apps_Trebuchet-af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0.tar.bz2 android_packages_apps_Trebuchet-af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0.zip |
Initial changes to restore clings.
Change-Id: Ie23e6e9f39679e8d35955a4a7db804d03f8b4d3f
Diffstat (limited to 'res/layout-port')
-rw-r--r-- | res/layout-port/first_run_cling.xml | 83 | ||||
-rw-r--r-- | res/layout-port/folder_cling.xml | 38 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 5 | ||||
-rw-r--r-- | res/layout-port/workspace_cling.xml | 48 |
4 files changed, 143 insertions, 31 deletions
diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml new file mode 100644 index 000000000..cdc49b9cb --- /dev/null +++ b/res/layout-port/first_run_cling.xml @@ -0,0 +1,83 @@ +<?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="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical"> + <TextView + style="@style/ClingAltTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="10dp" + android:text="@string/first_run_cling_title" + android:textColor="#49C0EC" + android:textSize="30sp" /> + <TextView + style="@style/ClingAltTitleText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/first_run_cling_description" + android:textColor="#80000000" + android:textSize="16sp" /> + </LinearLayout> + <TextView + style="@style/ClingHintText" + android:layout_width="160dp" + android:layout_height="wrap_content" + android:layout_gravity="top|end" + android:layout_marginEnd="10dp" + android:layout_marginTop="80dp" + android:text="@string/first_run_cling_search_bar_hint" /> + <TextView + style="@style/ClingHintText" + android:layout_width="160dp" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:layout_marginStart="10dp" + android:layout_marginTop="100dp" + android:text="@string/first_run_cling_custom_content_hint" /> + <TextView + style="@style/ClingHintText" + android:layout_width="160dp" + android:layout_height="wrap_content" + android:layout_gravity="bottom|end" + android:layout_marginEnd="10dp" + android:layout_marginBottom="100dp" + android:drawableEnd="@drawable/cling_arrow_right" + 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="15dp" + android:layout_marginEnd="20dp" + android:layout_gravity="bottom|end" + android:onClick="dismissFirstRunCling" /> +</com.android.launcher3.Cling> diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml index b91578fdb..bd4b5e2b1 100644 --- a/res/layout-port/folder_cling.xml +++ b/res/layout-port/folder_cling.xml @@ -21,29 +21,45 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="20dp" - android:layout_marginEnd="10dp" - android:layout_marginTop="@dimen/folderClingMarginTop"> + android:layout_marginEnd="20dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - <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" + <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="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:src="@drawable/cling_arrow_down" /> </LinearLayout> </FrameLayout> <Button style="@style/ClingButton" android:id="@+id/cling_dismiss" android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" + android:layout_marginEnd="20dp" android:layout_gravity="bottom|end" android:onClick="dismissFolderCling" /> </com.android.launcher3.Cling> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9844a370c..faef7a594 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. --> + <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/workspace_cling" android:id="@+id/workspace_cling" android:layout_width="match_parent" diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index 052e1a091..38d385896 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -20,43 +20,51 @@ android:layout_height="match_parent" launcher:drawIdentifier="workspace_portrait"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - android:layout_marginTop="90dp"> + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="120dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="bottom" android:orientation="vertical"> - <TextView - style="@style/ClingTitleText" + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" + 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:text="@string/workspace_cling_move_item" /> + 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> </LinearLayout> </FrameLayout> - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - android:layout_marginBottom="130dp" - android:layout_gravity="bottom" - android:gravity="center" - android:text="@string/workspace_cling_open_all_apps" /> <Button style="@style/ClingButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="15dp" - android:layout_marginEnd="10dp" + android:layout_marginEnd="20dp" android:layout_gravity="bottom|end" android:onClick="dismissWorkspaceCling" /> </com.android.launcher3.Cling> |