summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-09-18 18:26:31 -0700
committerWinson Chung <winsonc@google.com>2013-09-20 17:22:05 -0700
commitaf40f205d7f0c5f73a92ff5d9b8e9602dbde58c0 (patch)
tree0f36e6018c23e408c1dd846a9ef5ce063478fb65 /res
parent477828cc83b60a17eb9b6fc8ee08b4abbc3d2fb1 (diff)
downloadandroid_packages_apps_Trebuchet-af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0.zip
android_packages_apps_Trebuchet-af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0.tar.gz
android_packages_apps_Trebuchet-af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0.tar.bz2
Initial changes to restore clings.
Change-Id: Ie23e6e9f39679e8d35955a4a7db804d03f8b4d3f
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/btn_cling_normal.9.pngbin333 -> 0 bytes
-rw-r--r--res/drawable-hdpi/btn_cling_pressed.9.pngbin467 -> 0 bytes
-rw-r--r--res/drawable-hdpi/cling.9.pngbin0 -> 365 bytes
-rw-r--r--res/drawable-hdpi/cling.pngbin57394 -> 0 bytes
-rw-r--r--res/drawable-hdpi/cling_arrow_down.pngbin0 -> 521 bytes
-rw-r--r--res/drawable-hdpi/cling_arrow_left.pngbin0 -> 493 bytes
-rw-r--r--res/drawable-hdpi/cling_arrow_right.pngbin0 -> 540 bytes
-rw-r--r--res/drawable-hdpi/cling_arrow_up.pngbin0 -> 512 bytes
-rw-r--r--res/drawable-hdpi/cling_button.9.pngbin0 -> 416 bytes
-rw-r--r--res/drawable-hdpi/cling_button_pressed.9.pngbin0 -> 407 bytes
-rw-r--r--res/drawable-mdpi/btn_cling_normal.9.pngbin245 -> 0 bytes
-rw-r--r--res/drawable-mdpi/btn_cling_pressed.9.pngbin370 -> 0 bytes
-rw-r--r--res/drawable-mdpi/cling.9.pngbin0 -> 269 bytes
-rw-r--r--res/drawable-mdpi/cling.pngbin32299 -> 0 bytes
-rw-r--r--res/drawable-mdpi/cling_arrow_down.pngbin0 -> 485 bytes
-rw-r--r--res/drawable-mdpi/cling_arrow_left.pngbin0 -> 455 bytes
-rw-r--r--res/drawable-mdpi/cling_arrow_right.pngbin0 -> 486 bytes
-rw-r--r--res/drawable-mdpi/cling_arrow_up.pngbin0 -> 473 bytes
-rw-r--r--res/drawable-mdpi/cling_button.9.pngbin0 -> 355 bytes
-rw-r--r--res/drawable-mdpi/cling_button_pressed.9.pngbin0 -> 334 bytes
-rw-r--r--res/drawable-xhdpi/btn_cling_normal.9.pngbin400 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/btn_cling_pressed.9.pngbin601 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/cling.9.pngbin0 -> 406 bytes
-rw-r--r--res/drawable-xhdpi/cling.pngbin94777 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/cling_arrow_down.pngbin0 -> 602 bytes
-rw-r--r--res/drawable-xhdpi/cling_arrow_left.pngbin0 -> 618 bytes
-rw-r--r--res/drawable-xhdpi/cling_arrow_right.pngbin0 -> 629 bytes
-rw-r--r--res/drawable-xhdpi/cling_arrow_up.pngbin0 -> 602 bytes
-rw-r--r--res/drawable-xhdpi/cling_button.9.pngbin0 -> 484 bytes
-rw-r--r--res/drawable-xhdpi/cling_button_pressed.9.pngbin0 -> 466 bytes
-rw-r--r--res/drawable-xxhdpi/btn_cling_normal.9.pngbin1350 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/btn_cling_pressed.9.pngbin1551 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/cling.9.pngbin0 -> 1242 bytes
-rw-r--r--res/drawable-xxhdpi/cling.pngbin133911 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/cling_arrow_down.pngbin0 -> 1168 bytes
-rw-r--r--res/drawable-xxhdpi/cling_arrow_left.pngbin0 -> 1141 bytes
-rw-r--r--res/drawable-xxhdpi/cling_arrow_right.pngbin0 -> 1127 bytes
-rw-r--r--res/drawable-xxhdpi/cling_arrow_up.pngbin0 -> 1138 bytes
-rw-r--r--res/drawable-xxhdpi/cling_button.9.pngbin0 -> 1225 bytes
-rw-r--r--res/drawable-xxhdpi/cling_button_pressed.9.pngbin0 -> 1225 bytes
-rw-r--r--res/drawable/cling_button_bg.xml4
-rw-r--r--res/layout-land/first_run_cling.xml84
-rw-r--r--res/layout-land/folder_cling.xml41
-rw-r--r--res/layout-land/launcher.xml5
-rw-r--r--res/layout-land/workspace_cling.xml48
-rw-r--r--res/layout-port/first_run_cling.xml83
-rw-r--r--res/layout-port/folder_cling.xml38
-rw-r--r--res/layout-port/launcher.xml5
-rw-r--r--res/layout-port/workspace_cling.xml48
-rw-r--r--res/layout-sw720dp/folder_cling.xml46
-rw-r--r--res/layout-sw720dp/launcher.xml5
-rw-r--r--res/layout-sw720dp/workspace_cling.xml62
-rw-r--r--res/values/strings.xml22
-rw-r--r--res/values/styles.xml35
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
deleted file mode 100644
index aea8beb..0000000
--- a/res/drawable-hdpi/btn_cling_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png
deleted file mode 100644
index ebefd20..0000000
--- a/res/drawable-hdpi/btn_cling_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png
new file mode 100644
index 0000000..42a889f
--- /dev/null
+++ b/res/drawable-hdpi/cling.9.png
Binary files differ
diff --git a/res/drawable-hdpi/cling.png b/res/drawable-hdpi/cling.png
deleted file mode 100644
index d605799..0000000
--- a/res/drawable-hdpi/cling.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/cling_arrow_down.png b/res/drawable-hdpi/cling_arrow_down.png
new file mode 100644
index 0000000..4f521ea
--- /dev/null
+++ b/res/drawable-hdpi/cling_arrow_down.png
Binary files differ
diff --git a/res/drawable-hdpi/cling_arrow_left.png b/res/drawable-hdpi/cling_arrow_left.png
new file mode 100644
index 0000000..13764c9
--- /dev/null
+++ b/res/drawable-hdpi/cling_arrow_left.png
Binary files differ
diff --git a/res/drawable-hdpi/cling_arrow_right.png b/res/drawable-hdpi/cling_arrow_right.png
new file mode 100644
index 0000000..be52244
--- /dev/null
+++ b/res/drawable-hdpi/cling_arrow_right.png
Binary files differ
diff --git a/res/drawable-hdpi/cling_arrow_up.png b/res/drawable-hdpi/cling_arrow_up.png
new file mode 100644
index 0000000..83b5b37
--- /dev/null
+++ b/res/drawable-hdpi/cling_arrow_up.png
Binary files differ
diff --git a/res/drawable-hdpi/cling_button.9.png b/res/drawable-hdpi/cling_button.9.png
new file mode 100644
index 0000000..4dbe564
--- /dev/null
+++ b/res/drawable-hdpi/cling_button.9.png
Binary files differ
diff --git a/res/drawable-hdpi/cling_button_pressed.9.png b/res/drawable-hdpi/cling_button_pressed.9.png
new file mode 100644
index 0000000..2a85cab
--- /dev/null
+++ b/res/drawable-hdpi/cling_button_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_cling_normal.9.png b/res/drawable-mdpi/btn_cling_normal.9.png
deleted file mode 100644
index 43a407e..0000000
--- a/res/drawable-mdpi/btn_cling_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png
deleted file mode 100644
index bf0c8cb..0000000
--- a/res/drawable-mdpi/btn_cling_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png
new file mode 100644
index 0000000..f6f730d
--- /dev/null
+++ b/res/drawable-mdpi/cling.9.png
Binary files differ
diff --git a/res/drawable-mdpi/cling.png b/res/drawable-mdpi/cling.png
deleted file mode 100644
index fba3a07..0000000
--- a/res/drawable-mdpi/cling.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/cling_arrow_down.png b/res/drawable-mdpi/cling_arrow_down.png
new file mode 100644
index 0000000..58e66fb
--- /dev/null
+++ b/res/drawable-mdpi/cling_arrow_down.png
Binary files differ
diff --git a/res/drawable-mdpi/cling_arrow_left.png b/res/drawable-mdpi/cling_arrow_left.png
new file mode 100644
index 0000000..023c717
--- /dev/null
+++ b/res/drawable-mdpi/cling_arrow_left.png
Binary files differ
diff --git a/res/drawable-mdpi/cling_arrow_right.png b/res/drawable-mdpi/cling_arrow_right.png
new file mode 100644
index 0000000..cf0eb10
--- /dev/null
+++ b/res/drawable-mdpi/cling_arrow_right.png
Binary files differ
diff --git a/res/drawable-mdpi/cling_arrow_up.png b/res/drawable-mdpi/cling_arrow_up.png
new file mode 100644
index 0000000..9b0e6b7
--- /dev/null
+++ b/res/drawable-mdpi/cling_arrow_up.png
Binary files differ
diff --git a/res/drawable-mdpi/cling_button.9.png b/res/drawable-mdpi/cling_button.9.png
new file mode 100644
index 0000000..38de60a
--- /dev/null
+++ b/res/drawable-mdpi/cling_button.9.png
Binary files differ
diff --git a/res/drawable-mdpi/cling_button_pressed.9.png b/res/drawable-mdpi/cling_button_pressed.9.png
new file mode 100644
index 0000000..c60837d
--- /dev/null
+++ b/res/drawable-mdpi/cling_button_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_cling_normal.9.png b/res/drawable-xhdpi/btn_cling_normal.9.png
deleted file mode 100644
index 35511d6..0000000
--- a/res/drawable-xhdpi/btn_cling_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png
deleted file mode 100644
index a38b40f..0000000
--- a/res/drawable-xhdpi/btn_cling_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png
new file mode 100644
index 0000000..9cc03c9
--- /dev/null
+++ b/res/drawable-xhdpi/cling.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/cling.png b/res/drawable-xhdpi/cling.png
deleted file mode 100644
index 1cee1de..0000000
--- a/res/drawable-xhdpi/cling.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/cling_arrow_down.png b/res/drawable-xhdpi/cling_arrow_down.png
new file mode 100644
index 0000000..ee10933
--- /dev/null
+++ b/res/drawable-xhdpi/cling_arrow_down.png
Binary files differ
diff --git a/res/drawable-xhdpi/cling_arrow_left.png b/res/drawable-xhdpi/cling_arrow_left.png
new file mode 100644
index 0000000..cffbcf3
--- /dev/null
+++ b/res/drawable-xhdpi/cling_arrow_left.png
Binary files differ
diff --git a/res/drawable-xhdpi/cling_arrow_right.png b/res/drawable-xhdpi/cling_arrow_right.png
new file mode 100644
index 0000000..d880d67
--- /dev/null
+++ b/res/drawable-xhdpi/cling_arrow_right.png
Binary files differ
diff --git a/res/drawable-xhdpi/cling_arrow_up.png b/res/drawable-xhdpi/cling_arrow_up.png
new file mode 100644
index 0000000..fd2c60c
--- /dev/null
+++ b/res/drawable-xhdpi/cling_arrow_up.png
Binary files differ
diff --git a/res/drawable-xhdpi/cling_button.9.png b/res/drawable-xhdpi/cling_button.9.png
new file mode 100644
index 0000000..1c93bc4
--- /dev/null
+++ b/res/drawable-xhdpi/cling_button.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/cling_button_pressed.9.png b/res/drawable-xhdpi/cling_button_pressed.9.png
new file mode 100644
index 0000000..b5d4aae
--- /dev/null
+++ b/res/drawable-xhdpi/cling_button_pressed.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_cling_normal.9.png b/res/drawable-xxhdpi/btn_cling_normal.9.png
deleted file mode 100644
index f5e8032..0000000
--- a/res/drawable-xxhdpi/btn_cling_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_cling_pressed.9.png b/res/drawable-xxhdpi/btn_cling_pressed.9.png
deleted file mode 100644
index c507dd7..0000000
--- a/res/drawable-xxhdpi/btn_cling_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png
new file mode 100644
index 0000000..3dcf121
--- /dev/null
+++ b/res/drawable-xxhdpi/cling.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cling.png b/res/drawable-xxhdpi/cling.png
deleted file mode 100644
index 9446ea4..0000000
--- a/res/drawable-xxhdpi/cling.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_arrow_down.png b/res/drawable-xxhdpi/cling_arrow_down.png
new file mode 100644
index 0000000..48c4f06
--- /dev/null
+++ b/res/drawable-xxhdpi/cling_arrow_down.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_arrow_left.png b/res/drawable-xxhdpi/cling_arrow_left.png
new file mode 100644
index 0000000..8760d05
--- /dev/null
+++ b/res/drawable-xxhdpi/cling_arrow_left.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_arrow_right.png b/res/drawable-xxhdpi/cling_arrow_right.png
new file mode 100644
index 0000000..356ba17
--- /dev/null
+++ b/res/drawable-xxhdpi/cling_arrow_right.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_arrow_up.png b/res/drawable-xxhdpi/cling_arrow_up.png
new file mode 100644
index 0000000..4cb805f
--- /dev/null
+++ b/res/drawable-xxhdpi/cling_arrow_up.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_button.9.png b/res/drawable-xxhdpi/cling_button.9.png
new file mode 100644
index 0000000..4f68a03
--- /dev/null
+++ b/res/drawable-xxhdpi/cling_button.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_button_pressed.9.png b/res/drawable-xxhdpi/cling_button_pressed.9.png
new file mode 100644
index 0000000..4bc0337
--- /dev/null
+++ b/res/drawable-xxhdpi/cling_button_pressed.9.png
Binary files differ
diff --git a/res/drawable/cling_button_bg.xml b/res/drawable/cling_button_bg.xml
index 3809cde..7bf6ce7 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 0000000..f827380
--- /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 275edee..171e395 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 faf410b..2b9a9f3 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 8bd9e35..08fb8cf 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 0000000..cdc49b9
--- /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 b91578f..bd4b5e2 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 9844a37..faef7a5 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 052e1a0..38d3858 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 4193838..0000000
--- 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 fee0198..951e63a 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 052e1a0..0000000
--- 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 6b9b070..8406302 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 &amp; 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 &amp; 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 &amp; 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 &amp; 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 48b9dbc..e6bb935 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>