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 | |
| 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')
54 files changed, 335 insertions, 191 deletions
diff --git a/res/drawable-hdpi/btn_cling_normal.9.png b/res/drawable-hdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index aea8beb3e..000000000 --- a/res/drawable-hdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index ebefd20ad..000000000 --- a/res/drawable-hdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png Binary files differnew file mode 100644 index 000000000..42a889fb1 --- /dev/null +++ b/res/drawable-hdpi/cling.9.png diff --git a/res/drawable-hdpi/cling.png b/res/drawable-hdpi/cling.png Binary files differdeleted file mode 100644 index d60579940..000000000 --- a/res/drawable-hdpi/cling.png +++ /dev/null diff --git a/res/drawable-hdpi/cling_arrow_down.png b/res/drawable-hdpi/cling_arrow_down.png Binary files differnew file mode 100644 index 000000000..4f521eadc --- /dev/null +++ b/res/drawable-hdpi/cling_arrow_down.png diff --git a/res/drawable-hdpi/cling_arrow_left.png b/res/drawable-hdpi/cling_arrow_left.png Binary files differnew file mode 100644 index 000000000..13764c9e2 --- /dev/null +++ b/res/drawable-hdpi/cling_arrow_left.png diff --git a/res/drawable-hdpi/cling_arrow_right.png b/res/drawable-hdpi/cling_arrow_right.png Binary files differnew file mode 100644 index 000000000..be522441d --- /dev/null +++ b/res/drawable-hdpi/cling_arrow_right.png diff --git a/res/drawable-hdpi/cling_arrow_up.png b/res/drawable-hdpi/cling_arrow_up.png Binary files differnew file mode 100644 index 000000000..83b5b3783 --- /dev/null +++ b/res/drawable-hdpi/cling_arrow_up.png diff --git a/res/drawable-hdpi/cling_button.9.png b/res/drawable-hdpi/cling_button.9.png Binary files differnew file mode 100644 index 000000000..4dbe56433 --- /dev/null +++ b/res/drawable-hdpi/cling_button.9.png diff --git a/res/drawable-hdpi/cling_button_pressed.9.png b/res/drawable-hdpi/cling_button_pressed.9.png Binary files differnew file mode 100644 index 000000000..2a85cabfa --- /dev/null +++ b/res/drawable-hdpi/cling_button_pressed.9.png diff --git a/res/drawable-mdpi/btn_cling_normal.9.png b/res/drawable-mdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index 43a407e03..000000000 --- a/res/drawable-mdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index bf0c8cbb4..000000000 --- a/res/drawable-mdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png Binary files differnew file mode 100644 index 000000000..f6f730d86 --- /dev/null +++ b/res/drawable-mdpi/cling.9.png diff --git a/res/drawable-mdpi/cling.png b/res/drawable-mdpi/cling.png Binary files differdeleted file mode 100644 index fba3a0787..000000000 --- a/res/drawable-mdpi/cling.png +++ /dev/null diff --git a/res/drawable-mdpi/cling_arrow_down.png b/res/drawable-mdpi/cling_arrow_down.png Binary files differnew file mode 100644 index 000000000..58e66fbb2 --- /dev/null +++ b/res/drawable-mdpi/cling_arrow_down.png diff --git a/res/drawable-mdpi/cling_arrow_left.png b/res/drawable-mdpi/cling_arrow_left.png Binary files differnew file mode 100644 index 000000000..023c71705 --- /dev/null +++ b/res/drawable-mdpi/cling_arrow_left.png diff --git a/res/drawable-mdpi/cling_arrow_right.png b/res/drawable-mdpi/cling_arrow_right.png Binary files differnew file mode 100644 index 000000000..cf0eb1047 --- /dev/null +++ b/res/drawable-mdpi/cling_arrow_right.png diff --git a/res/drawable-mdpi/cling_arrow_up.png b/res/drawable-mdpi/cling_arrow_up.png Binary files differnew file mode 100644 index 000000000..9b0e6b7ae --- /dev/null +++ b/res/drawable-mdpi/cling_arrow_up.png diff --git a/res/drawable-mdpi/cling_button.9.png b/res/drawable-mdpi/cling_button.9.png Binary files differnew file mode 100644 index 000000000..38de60aee --- /dev/null +++ b/res/drawable-mdpi/cling_button.9.png diff --git a/res/drawable-mdpi/cling_button_pressed.9.png b/res/drawable-mdpi/cling_button_pressed.9.png Binary files differnew file mode 100644 index 000000000..c60837d2a --- /dev/null +++ b/res/drawable-mdpi/cling_button_pressed.9.png diff --git a/res/drawable-xhdpi/btn_cling_normal.9.png b/res/drawable-xhdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index 35511d6f9..000000000 --- a/res/drawable-xhdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index a38b40fa9..000000000 --- a/res/drawable-xhdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png Binary files differnew file mode 100644 index 000000000..9cc03c92c --- /dev/null +++ b/res/drawable-xhdpi/cling.9.png diff --git a/res/drawable-xhdpi/cling.png b/res/drawable-xhdpi/cling.png Binary files differdeleted file mode 100644 index 1cee1de51..000000000 --- a/res/drawable-xhdpi/cling.png +++ /dev/null diff --git a/res/drawable-xhdpi/cling_arrow_down.png b/res/drawable-xhdpi/cling_arrow_down.png Binary files differnew file mode 100644 index 000000000..ee1093340 --- /dev/null +++ b/res/drawable-xhdpi/cling_arrow_down.png diff --git a/res/drawable-xhdpi/cling_arrow_left.png b/res/drawable-xhdpi/cling_arrow_left.png Binary files differnew file mode 100644 index 000000000..cffbcf3ce --- /dev/null +++ b/res/drawable-xhdpi/cling_arrow_left.png diff --git a/res/drawable-xhdpi/cling_arrow_right.png b/res/drawable-xhdpi/cling_arrow_right.png Binary files differnew file mode 100644 index 000000000..d880d67f0 --- /dev/null +++ b/res/drawable-xhdpi/cling_arrow_right.png diff --git a/res/drawable-xhdpi/cling_arrow_up.png b/res/drawable-xhdpi/cling_arrow_up.png Binary files differnew file mode 100644 index 000000000..fd2c60c31 --- /dev/null +++ b/res/drawable-xhdpi/cling_arrow_up.png diff --git a/res/drawable-xhdpi/cling_button.9.png b/res/drawable-xhdpi/cling_button.9.png Binary files differnew file mode 100644 index 000000000..1c93bc41f --- /dev/null +++ b/res/drawable-xhdpi/cling_button.9.png diff --git a/res/drawable-xhdpi/cling_button_pressed.9.png b/res/drawable-xhdpi/cling_button_pressed.9.png Binary files differnew file mode 100644 index 000000000..b5d4aaea5 --- /dev/null +++ b/res/drawable-xhdpi/cling_button_pressed.9.png diff --git a/res/drawable-xxhdpi/btn_cling_normal.9.png b/res/drawable-xxhdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index f5e80326e..000000000 --- a/res/drawable-xxhdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/btn_cling_pressed.9.png b/res/drawable-xxhdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index c507dd734..000000000 --- a/res/drawable-xxhdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png Binary files differnew file mode 100644 index 000000000..3dcf12130 --- /dev/null +++ b/res/drawable-xxhdpi/cling.9.png diff --git a/res/drawable-xxhdpi/cling.png b/res/drawable-xxhdpi/cling.png Binary files differdeleted file mode 100644 index 9446ea4bd..000000000 --- a/res/drawable-xxhdpi/cling.png +++ /dev/null diff --git a/res/drawable-xxhdpi/cling_arrow_down.png b/res/drawable-xxhdpi/cling_arrow_down.png Binary files differnew file mode 100644 index 000000000..48c4f06fa --- /dev/null +++ b/res/drawable-xxhdpi/cling_arrow_down.png diff --git a/res/drawable-xxhdpi/cling_arrow_left.png b/res/drawable-xxhdpi/cling_arrow_left.png Binary files differnew file mode 100644 index 000000000..8760d05da --- /dev/null +++ b/res/drawable-xxhdpi/cling_arrow_left.png diff --git a/res/drawable-xxhdpi/cling_arrow_right.png b/res/drawable-xxhdpi/cling_arrow_right.png Binary files differnew file mode 100644 index 000000000..356ba178c --- /dev/null +++ b/res/drawable-xxhdpi/cling_arrow_right.png diff --git a/res/drawable-xxhdpi/cling_arrow_up.png b/res/drawable-xxhdpi/cling_arrow_up.png Binary files differnew file mode 100644 index 000000000..4cb805f45 --- /dev/null +++ b/res/drawable-xxhdpi/cling_arrow_up.png diff --git a/res/drawable-xxhdpi/cling_button.9.png b/res/drawable-xxhdpi/cling_button.9.png Binary files differnew file mode 100644 index 000000000..4f68a03ff --- /dev/null +++ b/res/drawable-xxhdpi/cling_button.9.png diff --git a/res/drawable-xxhdpi/cling_button_pressed.9.png b/res/drawable-xxhdpi/cling_button_pressed.9.png Binary files differnew file mode 100644 index 000000000..4bc033764 --- /dev/null +++ b/res/drawable-xxhdpi/cling_button_pressed.9.png diff --git a/res/drawable/cling_button_bg.xml b/res/drawable/cling_button_bg.xml index 3809cdecb..7bf6ce79f 100644 --- a/res/drawable/cling_button_bg.xml +++ b/res/drawable/cling_button_bg.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/btn_cling_pressed" /> - <item android:drawable="@drawable/btn_cling_normal" /> + <item android:state_pressed="true" android:drawable="@drawable/cling_button_pressed" /> + <item android:drawable="@drawable/cling_button" /> </selector> diff --git a/res/layout-land/first_run_cling.xml b/res/layout-land/first_run_cling.xml new file mode 100644 index 000000000..f82738096 --- /dev/null +++ b/res/layout-land/first_run_cling.xml @@ -0,0 +1,84 @@ +<?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:text="@string/first_run_cling_title" + android:textColor="#49C0EC" + android:textSize="32sp" /> + <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" + android:visibility="gone" /> + <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" + android:visibility="gone" /> + <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:text="@string/first_run_cling_create_screens_hint" + android:visibility="gone" /> + </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-land/folder_cling.xml b/res/layout-land/folder_cling.xml index 275edeead..171e39554 100644 --- a/res/layout-land/folder_cling.xml +++ b/res/layout-land/folder_cling.xml @@ -16,33 +16,50 @@ <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" - launcher:drawIdentifier="folder_landscape"> + launcher:drawIdentifier="folder_portrait"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp"> + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_marginTop="40dp" + android:layout_marginBottom="20dp"> <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-land/launcher.xml b/res/layout-land/launcher.xml index faf410be5..2b9a9f3e8 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. --> + <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-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index 8bd9e351f..08fb8cf23 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/workspace_cling.xml @@ -18,42 +18,54 @@ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="match_parent" android:layout_height="match_parent" - launcher:drawIdentifier="workspace_landscape"> + launcher:drawIdentifier="workspace_portrait"> <FrameLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginStart="40dp" - android:layout_marginTop="40dp"> + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="100dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginBottom="40dp" 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="180dp" - android:layout_height="wrap_content" - android:layout_marginEnd="130dp" - android:layout_gravity="end|center_vertical" - android:gravity="end" - 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> 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> diff --git a/res/layout-sw720dp/folder_cling.xml b/res/layout-sw720dp/folder_cling.xml deleted file mode 100644 index 4193838ca..000000000 --- a/res/layout-sw720dp/folder_cling.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?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" - launcher:drawIdentifier="folder_large"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/cling_text_block_offset_x" - android:layout_marginTop="@dimen/cling_text_block_offset_y"> - <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" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/folder_cling_create_folder" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="15dp" - android:onClick="dismissFolderCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index fee0198ed..951e63a39 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -65,6 +65,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-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml deleted file mode 100644 index 052e1a091..000000000 --- a/res/layout-sw720dp/workspace_cling.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?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="workspace_portrait"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - android:layout_marginTop="90dp"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <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> - </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_gravity="bottom|end" - android:onClick="dismissWorkspaceCling" /> -</com.android.launcher3.Cling> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6b9b07056..8406302c1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -226,21 +226,27 @@ s --> <!-- Clings --> <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> - <string name="workspace_cling_title">Make yourself at home</string> + <string name="first_run_cling_title">Welcome!</string> <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> - <string name="workspace_cling_move_item">You can put your favorite apps here.</string> - <!-- The description of how to open all apps from the workspace [CHAR_LIMIT=none] --> - <string name="workspace_cling_open_all_apps">To see all your apps, touch the circle.</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] --> + <string name="first_run_cling_search_bar_hint"></string> + <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string> + <!-- 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> <!-- 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">Organize your apps with folders</string> - <!-- The description of how to move an app [CHAR_LIMIT=none] --> - <string name="folder_cling_move_item">To move an app, touch & hold it.</string> + <string name="folder_cling_title">Create new folders for your apps</string> <!-- The description of how to create a folder [CHAR_LIMIT=none] --> - <string name="folder_cling_create_folder">To make a new folder on your Home screen, stack one app on top of another.</string> + <string name="folder_cling_create_folder">Touch & hold an app, then move it on top of another app icon</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] --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 48b9dbc9f..e6bb9359b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -35,34 +35,45 @@ <style name="ClingButton"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:paddingTop">10dp</item> + <item name="android:paddingTop">15dp</item> <item name="android:paddingBottom">15dp</item> - <item name="android:paddingStart">35dp</item> - <item name="android:paddingEnd">35dp</item> + <item name="android:paddingStart">50dp</item> + <item name="android:paddingEnd">50dp</item> <item name="android:text">@string/cling_dismiss</item> + <item name="android:textColor">#ffffff</item> <item name="android:textStyle">bold</item> + <item name="android:textSize">16sp</item> <item name="android:background">@drawable/cling_button_bg</item> </style> <style name="ClingTitleText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginBottom">5dp</item> - <item name="android:textSize">23sp</item> + <item name="android:textSize">22sp</item> + <item name="android:textColor">#ffffff</item> + <item name="android:fontFamily">sans-serif-condensed</item> + </style> + <style name="ClingAltTitleText"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textSize">24sp</item> <item name="android:textColor">#49C0EC</item> - <item name="android:shadowColor">#000000</item> - <item name="android:shadowDy">2</item> - <item name="android:shadowRadius">2.0</item> + <item name="android:fontFamily">sans-serif-condensed</item> </style> <style name="ClingText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">15sp</item> - <item name="android:textColor">#FFFFFF</item> - <item name="android:shadowColor">#000000</item> - <item name="android:shadowDy">2</item> - <item name="android:shadowRadius">2.0</item> + <item name="android:textSize">16sp</item> + <item name="android:textColor">#80000000</item> <item name="android:lineSpacingMultiplier">1.1</item> </style> + <style name="ClingHintText"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textSize">18sp</item> + <item name="android:textColor">#80ffffff</item> + <item name="android:fontFamily">sans-serif-condensed</item> + </style> <style name="WorkspaceIcon"> <item name="android:layout_width">match_parent</item> |
