diff options
Diffstat (limited to 'res')
46 files changed, 265 insertions, 106 deletions
diff --git a/res/drawable-hdpi/bg_cling1.png b/res/drawable-hdpi/bg_cling1.png Binary files differnew file mode 100644 index 0000000..0e15532 --- /dev/null +++ b/res/drawable-hdpi/bg_cling1.png diff --git a/res/drawable-hdpi/bg_cling2.png b/res/drawable-hdpi/bg_cling2.png Binary files differnew file mode 100644 index 0000000..e65d9a2 --- /dev/null +++ b/res/drawable-hdpi/bg_cling2.png diff --git a/res/drawable-hdpi/bg_cling3.png b/res/drawable-hdpi/bg_cling3.png Binary files differnew file mode 100644 index 0000000..ea71fbd --- /dev/null +++ b/res/drawable-hdpi/bg_cling3.png diff --git a/res/drawable-hdpi/btn_cling_normal.9.png b/res/drawable-hdpi/btn_cling_normal.9.png Binary files differnew file mode 100644 index 0000000..aea8beb --- /dev/null +++ b/res/drawable-hdpi/btn_cling_normal.9.png diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png Binary files differnew file mode 100644 index 0000000..ebefd20 --- /dev/null +++ b/res/drawable-hdpi/btn_cling_pressed.9.png diff --git a/res/drawable-hdpi/hand.png b/res/drawable-hdpi/hand.png Binary files differnew file mode 100644 index 0000000..4a73f2b --- /dev/null +++ b/res/drawable-hdpi/hand.png diff --git a/res/drawable-hdpi/hotseat_bg_panel.9.png b/res/drawable-hdpi/hotseat_bg_panel.9.png Binary files differindex 955b0e8..3c25e0e 100644 --- a/res/drawable-hdpi/hotseat_bg_panel.9.png +++ b/res/drawable-hdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-hdpi/search_bg_panel.9.png b/res/drawable-hdpi/search_bg_panel.9.png Binary files differindex af5066f..c868b2f 100644 --- a/res/drawable-hdpi/search_bg_panel.9.png +++ b/res/drawable-hdpi/search_bg_panel.9.png diff --git a/res/drawable-land-hdpi/hotseat_bg_panel.9.png b/res/drawable-land-hdpi/hotseat_bg_panel.9.png Binary files differindex 318234f..90177f8 100644 --- a/res/drawable-land-hdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-hdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-hdpi/search_bg_panel.9.png b/res/drawable-land-hdpi/search_bg_panel.9.png Binary files differindex f574e27..3642ea5 100644 --- a/res/drawable-land-hdpi/search_bg_panel.9.png +++ b/res/drawable-land-hdpi/search_bg_panel.9.png diff --git a/res/drawable-land-mdpi/hotseat_bg_panel.9.png b/res/drawable-land-mdpi/hotseat_bg_panel.9.png Binary files differindex 3dbb386..83c4a55 100644 --- a/res/drawable-land-mdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-mdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-mdpi/search_bg_panel.9.png b/res/drawable-land-mdpi/search_bg_panel.9.png Binary files differindex e6da309..ce3a7e4 100644 --- a/res/drawable-land-mdpi/search_bg_panel.9.png +++ b/res/drawable-land-mdpi/search_bg_panel.9.png diff --git a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png Binary files differindex 5824aa5..8718040 100644 --- a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-xhdpi/search_bg_panel.9.png b/res/drawable-land-xhdpi/search_bg_panel.9.png Binary files differindex fdda3cf..ca2b365 100644 --- a/res/drawable-land-xhdpi/search_bg_panel.9.png +++ b/res/drawable-land-xhdpi/search_bg_panel.9.png diff --git a/res/drawable-mdpi/bg_cling1.png b/res/drawable-mdpi/bg_cling1.png Binary files differnew file mode 100644 index 0000000..f284412 --- /dev/null +++ b/res/drawable-mdpi/bg_cling1.png diff --git a/res/drawable-mdpi/bg_cling2.png b/res/drawable-mdpi/bg_cling2.png Binary files differnew file mode 100644 index 0000000..0052dc2 --- /dev/null +++ b/res/drawable-mdpi/bg_cling2.png diff --git a/res/drawable-mdpi/bg_cling3.png b/res/drawable-mdpi/bg_cling3.png Binary files differnew file mode 100644 index 0000000..fabdf7a --- /dev/null +++ b/res/drawable-mdpi/bg_cling3.png diff --git a/res/drawable-mdpi/btn_cling_normal.9.png b/res/drawable-mdpi/btn_cling_normal.9.png Binary files differnew file mode 100644 index 0000000..43a407e --- /dev/null +++ b/res/drawable-mdpi/btn_cling_normal.9.png diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png Binary files differnew file mode 100644 index 0000000..bf0c8cb --- /dev/null +++ b/res/drawable-mdpi/btn_cling_pressed.9.png diff --git a/res/drawable-mdpi/hand.png b/res/drawable-mdpi/hand.png Binary files differnew file mode 100644 index 0000000..eb280e3 --- /dev/null +++ b/res/drawable-mdpi/hand.png diff --git a/res/drawable-mdpi/hotseat_bg_panel.9.png b/res/drawable-mdpi/hotseat_bg_panel.9.png Binary files differindex 7c31ee2..338db2c 100644 --- a/res/drawable-mdpi/hotseat_bg_panel.9.png +++ b/res/drawable-mdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-mdpi/search_bg_panel.9.png b/res/drawable-mdpi/search_bg_panel.9.png Binary files differindex 277d2ce..81f01ce 100644 --- a/res/drawable-mdpi/search_bg_panel.9.png +++ b/res/drawable-mdpi/search_bg_panel.9.png diff --git a/res/drawable-xhdpi/bg_cling1.png b/res/drawable-xhdpi/bg_cling1.png Binary files differnew file mode 100644 index 0000000..b71351a --- /dev/null +++ b/res/drawable-xhdpi/bg_cling1.png diff --git a/res/drawable-xhdpi/bg_cling2.png b/res/drawable-xhdpi/bg_cling2.png Binary files differnew file mode 100644 index 0000000..ad78dfe --- /dev/null +++ b/res/drawable-xhdpi/bg_cling2.png diff --git a/res/drawable-xhdpi/bg_cling3.png b/res/drawable-xhdpi/bg_cling3.png Binary files differnew file mode 100644 index 0000000..ae04195 --- /dev/null +++ b/res/drawable-xhdpi/bg_cling3.png diff --git a/res/drawable-xhdpi/btn_cling_normal.9.png b/res/drawable-xhdpi/btn_cling_normal.9.png Binary files differnew file mode 100644 index 0000000..35511d6 --- /dev/null +++ b/res/drawable-xhdpi/btn_cling_normal.9.png diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png Binary files differnew file mode 100644 index 0000000..a38b40f --- /dev/null +++ b/res/drawable-xhdpi/btn_cling_pressed.9.png diff --git a/res/drawable-xhdpi/hand.png b/res/drawable-xhdpi/hand.png Binary files differnew file mode 100644 index 0000000..aaaad37 --- /dev/null +++ b/res/drawable-xhdpi/hand.png diff --git a/res/drawable-xhdpi/hotseat_bg_panel.9.png b/res/drawable-xhdpi/hotseat_bg_panel.9.png Binary files differindex 570d929..cc3d0bc 100644 --- a/res/drawable-xhdpi/hotseat_bg_panel.9.png +++ b/res/drawable-xhdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-xhdpi/search_bg_panel.9.png b/res/drawable-xhdpi/search_bg_panel.9.png Binary files differindex 5f007c9..3cd534f 100644 --- a/res/drawable-xhdpi/search_bg_panel.9.png +++ b/res/drawable-xhdpi/search_bg_panel.9.png diff --git a/res/drawable/cling_button_bg.xml b/res/drawable/cling_button_bg.xml index 791250b..3809cde 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="@color/cling_button_pressed" /> - <item android:drawable="@color/cling_button" /> + <item android:state_pressed="true" android:drawable="@drawable/btn_cling_pressed" /> + <item android:drawable="@drawable/btn_cling_normal" /> </selector> diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml index 95d88b0..e89d4c1 100644 --- a/res/layout-land/all_apps_cling.xml +++ b/res/layout-land/all_apps_cling.xml @@ -16,29 +16,33 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="all_apps_landscape" - android:background="#CA000000"> + launcher:drawIdentifier="all_apps_landscape"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="20dp" - android:layout_marginTop="50dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:layout_marginTop="0dp" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="280dp" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="45dp" - android:text="@string/all_apps_cling_add_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="100dp" - android:onClick="dismissAllAppsCling" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/all_apps_cling_title" + android:text="@string/all_apps_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/all_apps_cling_add_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_add_item" /> + </LinearLayout> </FrameLayout> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissAllAppsCling" /> </com.android.launcher2.Cling> diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml new file mode 100644 index 0000000..91d34ad --- /dev/null +++ b/res/layout-land/folder_cling.xml @@ -0,0 +1,57 @@ +<?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.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="folder_landscape"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp"> + <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_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/folder_cling_move_item" /> + </LinearLayout> + </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="340dp" + android:layout_height="wrap_content" + android:layout_marginLeft="40dp" + android:layout_marginBottom="40dp" + android:layout_gravity="bottom" + android:text="@string/folder_cling_create_folder" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissFolderCling" /> +</com.android.launcher2.Cling> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 2b25bbb..084b163 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -87,4 +87,10 @@ 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" + android:layout_height="match_parent" + android:visibility="gone" /> </com.android.launcher2.DragLayer> diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index fa85507..dca3937 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/workspace_cling.xml @@ -16,36 +16,42 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="workspace_landscape" - android:background="#AA000000"> + launcher:drawIdentifier="workspace_landscape"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="20dp" - android:layout_marginTop="20dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="0dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="285dp" + android:layout_marginLeft="40dp" + android:layout_marginTop="40dp"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="50dp" - android:text="@string/workspace_cling_move_item" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" - android:layout_width="200dp" - android:layout_height="wrap_content" - android:layout_marginTop="100dp" - android:text="@string/workspace_cling_open_all_apps" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="160dp" - android:onClick="dismissWorkspaceCling" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/workspace_cling_title" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + </LinearLayout> </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_open_all_apps" + android:layout_width="180dp" + android:layout_height="wrap_content" + android:layout_marginRight="130dp" + android:layout_gravity="right|center_vertical" + android:gravity="right" + android:text="@string/workspace_cling_open_all_apps" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissWorkspaceCling" /> </com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml index cd702ed..e0dcf81 100644 --- a/res/layout-port/all_apps_cling.xml +++ b/res/layout-port/all_apps_cling.xml @@ -16,30 +16,33 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="all_apps_portrait" - android:background="#CA000000"> + launcher:drawIdentifier="all_apps_portrait"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="20dp" - android:layout_marginTop="50dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:layout_marginTop="0dp" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="280dp" + android:layout_marginTop="90dp"> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="45dp" - android:text="@string/all_apps_cling_add_item" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/all_apps_cling_title" + android:text="@string/all_apps_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/all_apps_cling_add_item" + android:layout_width="285dp" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_add_item" /> + </LinearLayout> </FrameLayout> <Button style="@style/ClingButton" android:id="@+id/cling_dismiss" - android:layout_marginBottom="40dp" - android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" android:onClick="dismissAllAppsCling" /> </com.android.launcher2.Cling> diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml new file mode 100644 index 0000000..d2374bf --- /dev/null +++ b/res/layout-port/folder_cling.xml @@ -0,0 +1,58 @@ +<?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.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="folder_portrait"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="20dp" + android:layout_marginTop="100dp"> + <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_move_item" + android:layout_width="285dp" + android:layout_height="wrap_content" + android:text="@string/folder_cling_move_item" /> + </LinearLayout> + </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="65dp" + android:layout_gravity="bottom" + android:text="@string/folder_cling_create_folder" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissFolderCling" /> +</com.android.launcher2.Cling> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 9637700..061d8e3 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -81,4 +81,10 @@ 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" + android:layout_height="match_parent" + android:visibility="gone" /> </com.android.launcher2.DragLayer> diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index 8c4a0b3..d5aff8a 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -16,36 +16,42 @@ <com.android.launcher2.Cling xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="workspace_portrait" - android:background="#AA000000"> + launcher:drawIdentifier="workspace_portrait"> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="20dp" android:layout_marginTop="90dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="0dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="285dp" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="50dp" - android:text="@string/workspace_cling_move_item" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" - android:layout_width="200dp" - android:layout_height="wrap_content" - android:layout_marginTop="100dp" - android:text="@string/workspace_cling_open_all_apps" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="160dp" - android:onClick="dismissWorkspaceCling" /> + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/workspace_cling_title" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + </LinearLayout> </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_open_all_apps" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="130dp" + android:layout_gravity="bottom" + android:gravity="center" + android:text="@string/workspace_cling_open_all_apps" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginBottom="15dp" + android:layout_marginRight="10dp" + android:layout_gravity="bottom|right" + android:onClick="dismissWorkspaceCling" /> </com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 75b0e7b..27f2efe 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -62,6 +62,8 @@ launcher:widgetCellHeightGap="@dimen/apps_customize_widget_cell_height_gap" launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" + launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" + launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" launcher:maxGap="@dimen/workspace_max_gap" /> <ImageView android:id="@+id/animation_buffer" diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 52c52f1..3532650 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -64,6 +64,8 @@ <dimen name="apps_customize_widget_cell_height_gap">5dp</dimen> <integer name="apps_customize_widget_cell_count_x">3</integer> <integer name="apps_customize_widget_cell_count_y">2</integer> + <integer name="apps_customize_cling_focused_x">2</integer> + <integer name="apps_customize_cling_focused_y">1</integer> <!-- Folders --> <!-- The size of the image which sits behind the preview of the folder contents --> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 5632fcd..1c8282d 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -32,6 +32,8 @@ <dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen> <dimen name="apps_customize_pageLayoutPaddingLeft">5dp</dimen> <dimen name="apps_customize_pageLayoutPaddingRight">5dp</dimen> + <integer name="apps_customize_cling_focused_x">1</integer> + <integer name="apps_customize_cling_focused_y">2</integer> <dimen name="apps_customize_widget_cell_width_gap">20dp</dimen> <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 6c0bc14..800aeaa 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -131,6 +131,10 @@ <attr name="widgetCountX" format="integer" /> <!-- Number of widgets vertically --> <attr name="widgetCountY" format="integer" /> + <!-- The x index of the item to be focused in the cling --> + <attr name="clingFocusedX" format="integer" /> + <!-- The y index of the item to be focused in the cling --> + <attr name="clingFocusedY" format="integer" /> </declare-styleable> <!-- HandleView specific attributes. These attributes are used to customize diff --git a/res/values/colors.xml b/res/values/colors.xml index 2389f8e..ece0fd8 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -32,7 +32,4 @@ <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color> <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color> - - <color name="cling_button">#BA49C0EC</color> - <color name="cling_button_pressed">#FF49C0EC</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 78c4b29..2ade5c8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -234,16 +234,21 @@ s --> <!-- Clings --> <!-- The title text for the workspace cling [CHAR_LIMIT=none] --> - <string name="workspace_cling_title">Welcome Home!</string> - <!-- The description of how to pick up and move an item on the workspace [CHAR_LIMIT=none] --> - <string name="workspace_cling_move_item">To move an app or widget, touch & hold, then reposition it.</string> + <string name="workspace_cling_title">Make yourself at home</string> + <!-- The description of how to use the workspace [CHAR_LIMIT=none] --> + <string name="workspace_cling_move_item">You can put your favourite 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 All Apps button.</string> + <string name="workspace_cling_open_all_apps">To see all your apps, touch the circle.</string> <!-- The title text for the All Apps cling [CHAR_LIMIT=none] --> - <string name="all_apps_cling_title">Here are all your apps</string> + <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 or widget to your home screen, touch & hold, then position it.</string> - + <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> + <!-- 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> <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] --> <string name="cling_dismiss">OK</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 9372dbe..19a05a0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,10 +28,10 @@ <style name="ClingButton"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:paddingTop">14dp</item> - <item name="android:paddingBottom">14dp</item> - <item name="android:paddingLeft">58dp</item> - <item name="android:paddingRight">58dp</item> + <item name="android:paddingTop">10dp</item> + <item name="android:paddingBottom">15dp</item> + <item name="android:paddingLeft">35dp</item> + <item name="android:paddingRight">35dp</item> <item name="android:text">@string/cling_dismiss</item> <item name="android:textStyle">bold</item> <item name="android:background">@drawable/cling_button_bg</item> @@ -39,7 +39,8 @@ <style name="ClingTitleText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">28sp</item> + <item name="android:layout_marginBottom">5dp</item> + <item name="android:textSize">23sp</item> <item name="android:textColor">#49C0EC</item> <item name="android:shadowColor">#000000</item> <item name="android:shadowDy">2</item> @@ -145,7 +146,7 @@ <item name="android:paddingRight">25dp</item> <item name="android:textColor">#FFFFFFFF</item> <item name="android:textSize">16sp</item> - <item name="android:shadowColor">#DD000000</item> + <item name="android:shadowColor">#FF000000</item> <item name="android:shadowDx">0.0</item> <item name="android:shadowDy">1.0</item> <item name="android:shadowRadius">4.0</item> |
