diff options
Diffstat (limited to 'res')
19 files changed, 278 insertions, 168 deletions
diff --git a/res/drawable-hdpi/bg_cling4.png b/res/drawable-hdpi/bg_cling4.png Binary files differnew file mode 100644 index 000000000..94036677e --- /dev/null +++ b/res/drawable-hdpi/bg_cling4.png diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png Binary files differindex 1533a158b..be2a88069 100644 --- a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-mdpi/bg_cling4.png b/res/drawable-mdpi/bg_cling4.png Binary files differnew file mode 100644 index 000000000..2f152f4db --- /dev/null +++ b/res/drawable-mdpi/bg_cling4.png diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png Binary files differindex ebbc7929e..3efe18e91 100644 --- a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xhdpi/bg_cling4.png b/res/drawable-xhdpi/bg_cling4.png Binary files differnew file mode 100644 index 000000000..f4bb83e39 --- /dev/null +++ b/res/drawable-xhdpi/bg_cling4.png diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png Binary files differindex 61d9b55cc..18c5a0abc 100644 --- a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png diff --git a/res/layout-sw600dp-land/all_apps_cling.xml b/res/layout-sw600dp-land/all_apps_cling.xml deleted file mode 100644 index bca7baf33..000000000 --- a/res/layout-sw600dp-land/all_apps_cling.xml +++ /dev/null @@ -1,43 +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.launcher2.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="large_all_apps_landscape"> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="160dp" - android:layout_marginLeft="200dp"> - <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="340dp" - 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="120dp" - android:onClick="dismissAllAppsCling" /> - </FrameLayout> -</com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-sw600dp-land/workspace_cling.xml b/res/layout-sw600dp-land/workspace_cling.xml deleted file mode 100644 index 7175297d7..000000000 --- a/res/layout-sw600dp-land/workspace_cling.xml +++ /dev/null @@ -1,54 +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.launcher2.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="large_workspace_landscape"> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="260dp" - android:layout_marginTop="30dp" - android:layout_gravity="left|center_vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="20dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="65dp" - android:text="@string/workspace_cling_move_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="95dp" - android:onClick="dismissWorkspaceCling" /> - </FrameLayout> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_open_all_apps" - android:layout_width="200dp" - android:layout_height="wrap_content" - android:layout_gravity="right|top" - android:layout_marginRight="160dp" - android:layout_marginTop="30dp" - android:gravity="left" - android:text="@string/workspace_cling_open_all_apps" /> -</com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml deleted file mode 100644 index 507af512f..000000000 --- a/res/layout-sw600dp-port/all_apps_cling.xml +++ /dev/null @@ -1,44 +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.launcher2.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="large_all_apps_portrait"> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="100dp" - android:layout_marginLeft="0dp"> - <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="340dp" - 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="95dp" - android:onClick="dismissAllAppsCling" /> - </FrameLayout> -</com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml new file mode 100644 index 000000000..017d0fde9 --- /dev/null +++ b/res/layout-sw600dp-port/folder_cling.xml @@ -0,0 +1,46 @@ +<?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_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@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="480dp" + 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.launcher2.Cling> diff --git a/res/layout-sw600dp-port/workspace_cling.xml b/res/layout-sw600dp-port/workspace_cling.xml index 0b9477c46..2eae0fc93 100644 --- a/res/layout-sw600dp-port/workspace_cling.xml +++ b/res/layout-sw600dp-port/workspace_cling.xml @@ -16,39 +16,41 @@ <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="large_workspace_portrait"> + launcher:drawIdentifier="workspace_large"> <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="60dp" - android:layout_marginTop="30dp" - android:layout_gravity="left|center_vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="20dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="wrap_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@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:layout_marginTop="65dp" - android:text="@string/workspace_cling_move_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="95dp" - 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" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginTop="15dp" + android:onClick="dismissWorkspaceCling" /> + </LinearLayout> </FrameLayout> <TextView style="@style/ClingText" android:id="@+id/workspace_cling_open_all_apps" - android:layout_width="200dp" + android:layout_width="180dp" android:layout_height="wrap_content" - android:layout_gravity="right|top" - android:layout_marginRight="160dp" - android:layout_marginTop="30dp" - android:gravity="left" + android:layout_marginTop="15dp" + android:layout_marginRight="150dp" + android:layout_gravity="right" + android:gravity="right" android:text="@string/workspace_cling_open_all_apps" /> </com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-sw600dp/all_apps_cling.xml b/res/layout-sw600dp/all_apps_cling.xml new file mode 100644 index 000000000..7079b2107 --- /dev/null +++ b/res/layout-sw600dp/all_apps_cling.xml @@ -0,0 +1,46 @@ +<?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="all_apps_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@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/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" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginTop="15dp" + android:onClick="dismissAllAppsCling" /> + </LinearLayout> + </FrameLayout> +</com.android.launcher2.Cling> diff --git a/res/layout-sw600dp/folder_cling.xml b/res/layout-sw600dp/folder_cling.xml new file mode 100644 index 000000000..4188804c2 --- /dev/null +++ b/res/layout-sw600dp/folder_cling.xml @@ -0,0 +1,46 @@ +<?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_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@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.launcher2.Cling> diff --git a/res/layout-sw600dp/launcher.xml b/res/layout-sw600dp/launcher.xml index bfa6f3e08..94c69a683 100644 --- a/res/layout-sw600dp/launcher.xml +++ b/res/layout-sw600dp/launcher.xml @@ -45,4 +45,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-sw600dp/workspace_cling.xml b/res/layout-sw600dp/workspace_cling.xml new file mode 100644 index 000000000..264b1e000 --- /dev/null +++ b/res/layout-sw600dp/workspace_cling.xml @@ -0,0 +1,56 @@ +<?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="workspace_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@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/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" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginTop="15dp" + android:onClick="dismissWorkspaceCling" /> + </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_marginTop="90dp" + android:layout_marginRight="130dp" + android:layout_gravity="right" + android:gravity="right" + android:text="@string/workspace_cling_open_all_apps" /> +</com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index f51f6f9a4..42c435379 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -37,4 +37,11 @@ <dimen name="apps_customize_pageLayoutPaddingRight">30dp</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">4</integer> + <integer name="apps_customize_cling_focused_y">2</integer> + +<!-- Cling --> + <!-- The offset for the text in the cling --> + <dimen name="cling_text_block_offset_x">140dp</dimen> + <dimen name="cling_text_block_offset_y">80dp</dimen> </resources> diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml index 6753cbfe9..5de73b641 100644 --- a/res/values-sw600dp-port/dimens.xml +++ b/res/values-sw600dp-port/dimens.xml @@ -40,4 +40,11 @@ <dimen name="apps_customize_pageLayoutPaddingRight">30dp</dimen> <integer name="apps_customize_widget_cell_count_x">2</integer> <integer name="apps_customize_widget_cell_count_y">3</integer> + <integer name="apps_customize_cling_focused_x">2</integer> + <integer name="apps_customize_cling_focused_y">2</integer> + +<!-- Cling --> + <!-- The offset for the text in the cling --> + <dimen name="cling_text_block_offset_x">80dp</dimen> + <dimen name="cling_text_block_offset_y">160dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 1905fad4a..e0542ba98 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -18,6 +18,38 @@ --> <resources> +<!-- Clings --> + <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: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:textSize">20sp</item> + <item name="android:textStyle">bold</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">32sp</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> + </style> + <style name="ClingText"> + <item name="android:textSize">22sp</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:lineSpacingMultiplier">1.1</item> + </style> + <!-- Workspace --> <style name="WorkspaceIcon.Portrait"> <item name="android:drawablePadding">0dp</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index a744ccefb..fe0cb00fa 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,6 +18,9 @@ <!-- Cling --> <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen> <dimen name="folderClingMarginTop">20dp</dimen> + <!-- The offset for the text in the cling --> + <dimen name="cling_text_block_offset_x">0dp</dimen> + <dimen name="cling_text_block_offset_y">0dp</dimen> <!-- Workspace --> <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding |