PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d016015c: Enabling clings for tablets (Bug 5506377)

Browse Source 
* commit 'd016015c2396b885a7ba30f3678d5c50830c20bd':
  Enabling clings for tablets (Bug 5506377)
This commit is contained in:
Winson Chung
2011-11-18 13:35:17 -08:00
committed by Android Git Automerger
parent 515027d322 d016015c23
commit f8e2365fc8
21 changed files with 301 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/drawable-hdpi/bg_cling4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 647 B

res/drawable-hdpi/ic_home_all_apps_holo_dark.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

res/drawable-mdpi/bg_cling4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 537 B

res/drawable-mdpi/ic_home_all_apps_holo_dark.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1003 B

After

Width:  |  Height:  |  Size: 979 B

res/drawable-xhdpi/bg_cling4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 986 B

res/drawable-xhdpi/ic_home_all_apps_holo_dark.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

res/layout-sw600dp-land/all_apps_cling.xml
-43
View File
@@ -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>
res/layout-sw600dp-land/workspace_cling.xml
-54
View File
@@ -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>
res/layout-sw600dp-port/all_apps_cling.xml
-44
View File
@@ -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>
res/layout-sw600dp-port/folder_cling.xml
+46
View File
@@ -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>
res/layout-sw600dp-port/workspace_cling.xml
+29 -27
View File
@@ -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>
res/layout-sw600dp/all_apps_cling.xml
+46
View File
@@ -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>
res/layout-sw600dp/folder_cling.xml
+46
View File
@@ -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>
res/layout-sw600dp/launcher.xml
+6
View File
@@ -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>
res/layout-sw600dp/workspace_cling.xml
+56
View File
@@ -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>
res/values-sw600dp-land/dimens.xml
+7
View File
@@ -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>
res/values-sw600dp-port/dimens.xml
+7
View File
@@ -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>
res/values-sw600dp/styles.xml
+32
View File
@@ -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>
res/values/dimens.xml
+3
View File
@@ -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
src/com/android/launcher2/Cling.java
+23 -6
View File
@@ -44,6 +44,9 @@ public class Cling extends FrameLayout {
private static String ALLAPPS_LANDSCAPE = "all_apps_landscape";
private static String FOLDER_PORTRAIT = "folder_portrait";
private static String FOLDER_LANDSCAPE = "folder_landscape";
private static String WORKSPACE_LARGE = "workspace_large";
private static String FOLDER_LARGE = "folder_large";
private static String ALLAPPS_LARGE = "all_apps_large";
private Launcher mLauncher;
private boolean mIsInitialized;
@@ -109,8 +112,14 @@ public class Cling extends FrameLayout {
return new int[]{getMeasuredWidth() / 2, getMeasuredHeight() - (mButtonBarHeight / 2)};
} else if (mDrawIdentifier.equals(WORKSPACE_LANDSCAPE)) {
return new int[]{getMeasuredWidth() - (mButtonBarHeight / 2), getMeasuredHeight() / 2};
} else if (mDrawIdentifier.equals(WORKSPACE_LARGE)) {
final float scale = LauncherApplication.getScreenDensity();
final int cornerXOffset = (int) (scale * 15);
final int cornerYOffset = (int) (scale * 10);
return new int[]{getMeasuredWidth() - cornerXOffset, cornerYOffset};
} else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT) ||
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) {
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE) ||
mDrawIdentifier.equals(ALLAPPS_LARGE)) {
return mPositionData;
}
return new int[]{-1, -1};
@@ -120,8 +129,10 @@ public class Cling extends FrameLayout {
public boolean onTouchEvent(android.view.MotionEvent event) {
if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) ||
mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
mDrawIdentifier.equals(WORKSPACE_LARGE) ||
mDrawIdentifier.equals(ALLAPPS_PORTRAIT) ||
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) {
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE) ||
mDrawIdentifier.equals(ALLAPPS_LARGE)) {
int[] pos = getPunchThroughPosition();
double diff = Math.sqrt(Math.pow(event.getX() - pos[0], 2) +
Math.pow(event.getY() - pos[1], 2));
@@ -129,7 +140,8 @@ public class Cling extends FrameLayout {
return false;
}
} else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) ||
mDrawIdentifier.equals(FOLDER_LANDSCAPE)) {
mDrawIdentifier.equals(FOLDER_LANDSCAPE) ||
mDrawIdentifier.equals(FOLDER_LARGE)) {
Folder f = mLauncher.getWorkspace().getOpenFolder();
if (f != null) {
Rect r = new Rect();
@@ -156,14 +168,18 @@ public class Cling extends FrameLayout {
// Draw the background
if (mBackground == null) {
if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) ||
mDrawIdentifier.equals(WORKSPACE_LANDSCAPE)) {
mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
mDrawIdentifier.equals(WORKSPACE_LARGE)) {
mBackground = getResources().getDrawable(R.drawable.bg_cling1);
} else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT) ||
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) {
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE) ||
mDrawIdentifier.equals(ALLAPPS_LARGE)) {
mBackground = getResources().getDrawable(R.drawable.bg_cling2);
} else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) ||
mDrawIdentifier.equals(FOLDER_LANDSCAPE)) {
mBackground = getResources().getDrawable(R.drawable.bg_cling3);
} else if (mDrawIdentifier.equals(FOLDER_LARGE)) {
mBackground = getResources().getDrawable(R.drawable.bg_cling4);
}
}
if (mBackground != null) {
@@ -191,7 +207,8 @@ public class Cling extends FrameLayout {
// Draw the hand graphic in All Apps
if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT) ||
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE)) {
mDrawIdentifier.equals(ALLAPPS_LANDSCAPE) ||
mDrawIdentifier.equals(ALLAPPS_LARGE)) {
if (mHandTouchGraphic == null) {
mHandTouchGraphic = getResources().getDrawable(R.drawable.hand);
}
src/com/android/launcher2/Launcher.java
-2
View File
@@ -3168,8 +3168,6 @@ public final class Launcher extends Activity
/* Cling related */
private static final String PREFS_KEY = "com.android.launcher2.prefs";
private boolean isClingsEnabled() {
// TEMPORARY: DISABLE CLINGS ON LARGE UI
if (LauncherApplication.isScreenLarge()) return false;
// disable clings when running in a test harness
if(ActivityManager.isRunningInTestHarness()) return false;