Merge "Fixing issue where updating the visibility of one application can trigger all icons to disappear. (Bug 8757421)" into jb-mr2-dev
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 4b45807..346d29b 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -25,11 +25,7 @@
android:background="@drawable/workspace_bg">
<com.android.launcher2.DragLayer
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
android:id="@+id/drag_layer"
- android:background="@drawable/workspace_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
@@ -116,4 +112,4 @@
android:layout_height="match_parent"
android:visibility="invisible" />
</com.android.launcher2.DragLayer>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 1fc5322..2bacf36 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -25,11 +25,7 @@
android:background="@drawable/workspace_bg">
<com.android.launcher2.DragLayer
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
android:id="@+id/drag_layer"
- android:background="@drawable/workspace_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
@@ -117,4 +113,4 @@
android:layout_height="match_parent"
android:visibility="invisible" />
</com.android.launcher2.DragLayer>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 74bc9bd..8e9885d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -95,7 +95,7 @@
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"%2$d में %1$d विजेट पृष्ठ"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"जैसा चाहें वैसा उपयोग करें"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"आप अपने पसंदीदा एप्लिकेशन यहां रख सकते हैं."</string>
- <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"अपने सभी एप्लिकेशन देखने के लिए, मंडली को स्पर्श करें."</string>
+ <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"अपने सभी एप्लिकेशन देखने के लिए, वृत्त को स्पर्श करें."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"कुछ एप्लिकेशन चुनें"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"किसी एप्लिकेशन को अपनी मुखपृष्ठ स्क्रीन से जोड़ने के लिए, उसे स्पर्श करके रखें."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"अपने एप्लिकेशन को फ़ोल्डर के साथ व्यवस्थित करें"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bf67f04..39f24cb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -94,7 +94,7 @@
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"แอปพลิเคชันหน้า %1$d จาก %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"วิดเจ็ตหน้า %1$d จาก %2$d"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"เชิญตามสบาย"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"คุณสามารถวางแอปพลิเคชันโปรดของคุณไว้ที่นี่"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"วางแอปพลิเคชันโปรดของคุณได้ที่นี่"</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"หากต้องการดูแอปพลิเคชันทั้งหมด โปรดแตะที่วงกลม"</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"เลือกบางแอปพลิเคชัน"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"หากต้องการเพิ่มแอปพลิเคชันลงในหน้าจอหลัก ให้แตะแอปพลิเคชันค้างไว้"</string>
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index e8be3ef..6b32882 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -441,6 +441,9 @@
cling.bringToFront();
}
setFocusOnFirstChild();
+ setAlpha(1);
+ setScaleX(1);
+ setScaleY(1);
}
});
oa.setDuration(mExpandDuration);
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5ed7f6b..d9d20da 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -288,7 +288,6 @@
private static Drawable.ConstantState[] sAppMarketIcon = new Drawable.ConstantState[2];
private Drawable mWorkspaceBackgroundDrawable;
- private Drawable mBlackBackgroundDrawable;
private final ArrayList<Integer> mSynchronouslyBoundPages = new ArrayList<Integer>();
@@ -959,7 +958,6 @@
mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
mWorkspaceBackgroundDrawable = getResources().getDrawable(R.drawable.workspace_bg);
- mBlackBackgroundDrawable = new ColorDrawable(Color.BLACK);
// Setup the drag layer
mDragLayer.setup(this, dragController);
@@ -2433,7 +2431,7 @@
private void setWorkspaceBackground(boolean workspace) {
mLauncherView.setBackground(workspace ?
- mWorkspaceBackgroundDrawable : mBlackBackgroundDrawable);
+ mWorkspaceBackgroundDrawable : null);
}
void updateWallpaperVisibility(boolean visible) {