diff options
30 files changed, 106 insertions, 2 deletions
diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png Binary files differindex b118be1..5552708 100644 --- a/res/drawable-hdpi/focused_bg.9.png +++ b/res/drawable-hdpi/focused_bg.9.png diff --git a/res/drawable-hdpi/page_hover_left_holo.9.png b/res/drawable-hdpi/page_hover_left_holo.9.png Binary files differindex 735eff6..2ac2c39 100644 --- a/res/drawable-hdpi/page_hover_left_holo.9.png +++ b/res/drawable-hdpi/page_hover_left_holo.9.png diff --git a/res/drawable-hdpi/page_hover_right_holo.9.png b/res/drawable-hdpi/page_hover_right_holo.9.png Binary files differindex 9d7aca4..4c0b1ea 100644 --- a/res/drawable-hdpi/page_hover_right_holo.9.png +++ b/res/drawable-hdpi/page_hover_right_holo.9.png diff --git a/res/drawable-hdpi/search_frame.9.png b/res/drawable-hdpi/search_frame.9.png Binary files differindex 7fbf24f..15ca1f4 100644 --- a/res/drawable-hdpi/search_frame.9.png +++ b/res/drawable-hdpi/search_frame.9.png diff --git a/res/drawable-hdpi/widget_resize_frame_holo.9.png b/res/drawable-hdpi/widget_resize_frame_holo.9.png Binary files differindex c41fbca..059a9d6 100644 --- a/res/drawable-hdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-hdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-hdpi/widget_resize_handle_bottom.png b/res/drawable-hdpi/widget_resize_handle_bottom.png Binary files differindex e039165..bc4418f 100644 --- a/res/drawable-hdpi/widget_resize_handle_bottom.png +++ b/res/drawable-hdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-hdpi/widget_resize_handle_left.png b/res/drawable-hdpi/widget_resize_handle_left.png Binary files differindex bfc2e30..b808170 100644 --- a/res/drawable-hdpi/widget_resize_handle_left.png +++ b/res/drawable-hdpi/widget_resize_handle_left.png diff --git a/res/drawable-hdpi/widget_resize_handle_right.png b/res/drawable-hdpi/widget_resize_handle_right.png Binary files differindex a7245b8..bcb8104 100644 --- a/res/drawable-hdpi/widget_resize_handle_right.png +++ b/res/drawable-hdpi/widget_resize_handle_right.png diff --git a/res/drawable-hdpi/widget_resize_handle_top.png b/res/drawable-hdpi/widget_resize_handle_top.png Binary files differindex 447f59a..3ec18de 100644 --- a/res/drawable-hdpi/widget_resize_handle_top.png +++ b/res/drawable-hdpi/widget_resize_handle_top.png diff --git a/res/drawable-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png Binary files differindex b118be1..00f05d8 100644 --- a/res/drawable-mdpi/focused_bg.9.png +++ b/res/drawable-mdpi/focused_bg.9.png diff --git a/res/drawable-mdpi/page_hover_left_holo.9.png b/res/drawable-mdpi/page_hover_left_holo.9.png Binary files differindex 87c90ed..e1e84c9 100644 --- a/res/drawable-mdpi/page_hover_left_holo.9.png +++ b/res/drawable-mdpi/page_hover_left_holo.9.png diff --git a/res/drawable-mdpi/page_hover_right_holo.9.png b/res/drawable-mdpi/page_hover_right_holo.9.png Binary files differindex f725846..894c263 100644 --- a/res/drawable-mdpi/page_hover_right_holo.9.png +++ b/res/drawable-mdpi/page_hover_right_holo.9.png diff --git a/res/drawable-mdpi/search_frame.9.png b/res/drawable-mdpi/search_frame.9.png Binary files differindex e6e048a..058905b 100644 --- a/res/drawable-mdpi/search_frame.9.png +++ b/res/drawable-mdpi/search_frame.9.png diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png Binary files differindex 095919f..435f3aa 100644 --- a/res/drawable-mdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-mdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png Binary files differindex 873d1be..848af0a 100644 --- a/res/drawable-mdpi/widget_resize_handle_bottom.png +++ b/res/drawable-mdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png Binary files differindex 99a88ac..0e62c9c 100644 --- a/res/drawable-mdpi/widget_resize_handle_left.png +++ b/res/drawable-mdpi/widget_resize_handle_left.png diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png Binary files differindex ed0a539..5c8d477 100644 --- a/res/drawable-mdpi/widget_resize_handle_right.png +++ b/res/drawable-mdpi/widget_resize_handle_right.png diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png Binary files differindex f4159fe..609e06b 100644 --- a/res/drawable-mdpi/widget_resize_handle_top.png +++ b/res/drawable-mdpi/widget_resize_handle_top.png diff --git a/res/drawable-xhdpi/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png Binary files differindex d445c59..b545f8e 100644 --- a/res/drawable-xhdpi/focused_bg.9.png +++ b/res/drawable-xhdpi/focused_bg.9.png diff --git a/res/drawable-xhdpi/page_hover_left_holo.9.png b/res/drawable-xhdpi/page_hover_left_holo.9.png Binary files differindex 48b0d9d..b00d367 100644 --- a/res/drawable-xhdpi/page_hover_left_holo.9.png +++ b/res/drawable-xhdpi/page_hover_left_holo.9.png diff --git a/res/drawable-xhdpi/page_hover_right_holo.9.png b/res/drawable-xhdpi/page_hover_right_holo.9.png Binary files differindex da14ffe..77376d4 100644 --- a/res/drawable-xhdpi/page_hover_right_holo.9.png +++ b/res/drawable-xhdpi/page_hover_right_holo.9.png diff --git a/res/drawable-xhdpi/search_frame.9.png b/res/drawable-xhdpi/search_frame.9.png Binary files differindex 706b1d8..32a0714 100644 --- a/res/drawable-xhdpi/search_frame.9.png +++ b/res/drawable-xhdpi/search_frame.9.png diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png Binary files differindex d099206..270c9b7 100644 --- a/res/drawable-xhdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-xhdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png Binary files differindex 62882c8..d4b11c9 100644 --- a/res/drawable-xhdpi/widget_resize_handle_bottom.png +++ b/res/drawable-xhdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png Binary files differindex 6f45c99..6eb7cd0 100644 --- a/res/drawable-xhdpi/widget_resize_handle_left.png +++ b/res/drawable-xhdpi/widget_resize_handle_left.png diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png Binary files differindex 28437f1..01d96ab 100644 --- a/res/drawable-xhdpi/widget_resize_handle_right.png +++ b/res/drawable-xhdpi/widget_resize_handle_right.png diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png Binary files differindex 0d187ad..9066218 100644 --- a/res/drawable-xhdpi/widget_resize_handle_top.png +++ b/res/drawable-xhdpi/widget_resize_handle_top.png diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml new file mode 100644 index 0000000..8bf8d15 --- /dev/null +++ b/res/layout-sw600dp-port/all_apps_cling.xml @@ -0,0 +1,51 @@ +<?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_portrait"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="20dp" + android:layout_marginTop="20dp"> + <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" /> + </LinearLayout> + </FrameLayout> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_width="118dp" + android:layout_height="54dp" + android:textSize="24sp" + android:layout_marginBottom="27dp" + android:layout_marginRight="36dp" + android:layout_gravity="bottom|right" + android:onClick="dismissAllAppsCling" /> +</com.android.launcher2.Cling> diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml new file mode 100644 index 0000000..d154a5b --- /dev/null +++ b/res/layout-sw600dp-port/folder_cling.xml @@ -0,0 +1,52 @@ +<?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_marginRight="10dp" + android:layout_marginTop="@dimen/folderClingMarginTop"> + <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" /> + </LinearLayout> + </FrameLayout> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_width="118dp" + android:layout_height="54dp" + android:textSize="24sp" + android:layout_marginBottom="27dp" + android:layout_marginRight="36dp" + android:layout_gravity="bottom|right" + android:onClick="dismissFolderCling" /> +</com.android.launcher2.Cling> diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java index 7978298..d61b988 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -186,11 +186,12 @@ public class Cling extends FrameLayout { mDrawIdentifier.equals(ALLAPPS_LARGE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling2); } else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) || - mDrawIdentifier.equals(FOLDER_LANDSCAPE) || - mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mDrawIdentifier.equals(FOLDER_LANDSCAPE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling3); } else if (mDrawIdentifier.equals(FOLDER_LARGE)) { mBackground = getResources().getDrawable(R.drawable.bg_cling4); + } else if (mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { + mBackground = getResources().getDrawable(R.drawable.bg_cling5); } } if (mBackground != null) { |
