From f876301d0a460bec260a3c7a6ab260a06d5817ba Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 23 Sep 2014 16:22:10 -0700
Subject: UI Fixes

> Adding a scrim to the longpress cling

Bug: 17573777

High level design asks (very low-risk)
> Changing the dialog to use device default theme
> Updating screenpanel assets

Change-Id: Ia0216b60fd8cd607d83a5e7c3d7e6c8255125eda
---
 res/drawable-hdpi/screenpanel.9.png         | Bin 137 -> 218 bytes
 res/drawable-hdpi/screenpanel_hover.9.png   | Bin 137 -> 218 bytes
 res/drawable-mdpi/screenpanel.9.png         | Bin 137 -> 222 bytes
 res/drawable-mdpi/screenpanel_hover.9.png   | Bin 137 -> 220 bytes
 res/drawable-xhdpi/screenpanel.9.png        | Bin 181 -> 273 bytes
 res/drawable-xhdpi/screenpanel_hover.9.png  | Bin 180 -> 281 bytes
 res/drawable-xxhdpi/screenpanel.9.png       | Bin 218 -> 346 bytes
 res/drawable-xxhdpi/screenpanel_hover.9.png | Bin 216 -> 334 bytes
 res/layout-land/longpress_cling.xml         |   1 +
 res/layout-port/longpress_cling.xml         |   3 ++-
 res/layout-sw600dp-port/longpress_cling.xml |   1 +
 res/values/colors.xml                       |   1 +
 src/com/android/launcher3/Launcher.java     |   3 ++-
 13 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png
index bf806c3ec..f7ae01162 100644
Binary files a/res/drawable-hdpi/screenpanel.9.png and b/res/drawable-hdpi/screenpanel.9.png differ
diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png
index 172683754..ac8e83dbd 100644
Binary files a/res/drawable-hdpi/screenpanel_hover.9.png and b/res/drawable-hdpi/screenpanel_hover.9.png differ
diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png
index a9bed9f48..c2779fcf3 100644
Binary files a/res/drawable-mdpi/screenpanel.9.png and b/res/drawable-mdpi/screenpanel.9.png differ
diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png
index ce1219798..70b30785f 100644
Binary files a/res/drawable-mdpi/screenpanel_hover.9.png and b/res/drawable-mdpi/screenpanel_hover.9.png differ
diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png
index fe604ba36..53a781206 100644
Binary files a/res/drawable-xhdpi/screenpanel.9.png and b/res/drawable-xhdpi/screenpanel.9.png differ
diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png
index 3c05dc5d5..a2e200f13 100644
Binary files a/res/drawable-xhdpi/screenpanel_hover.9.png and b/res/drawable-xhdpi/screenpanel_hover.9.png differ
diff --git a/res/drawable-xxhdpi/screenpanel.9.png b/res/drawable-xxhdpi/screenpanel.9.png
index 2769bddb8..2d1395479 100644
Binary files a/res/drawable-xxhdpi/screenpanel.9.png and b/res/drawable-xxhdpi/screenpanel.9.png differ
diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png
index e36d293de..369fc44e1 100644
Binary files a/res/drawable-xxhdpi/screenpanel_hover.9.png and b/res/drawable-xxhdpi/screenpanel_hover.9.png differ
diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml
index d1b30a822..93bbc077a 100644
--- a/res/layout-land/longpress_cling.xml
+++ b/res/layout-land/longpress_cling.xml
@@ -4,6 +4,7 @@
     android:id="@+id/longpress_cling"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/cling_scrim_background"
     android:orientation="vertical" >
 
     <Space
diff --git a/res/layout-port/longpress_cling.xml b/res/layout-port/longpress_cling.xml
index d0f1ab712..8e35f5c1a 100644
--- a/res/layout-port/longpress_cling.xml
+++ b/res/layout-port/longpress_cling.xml
@@ -3,7 +3,8 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
     android:id="@+id/longpress_cling"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@color/cling_scrim_background" >
 
     <FrameLayout
         android:id="@+id/cling_content"
diff --git a/res/layout-sw600dp-port/longpress_cling.xml b/res/layout-sw600dp-port/longpress_cling.xml
index 090adc58a..b42d697a5 100644
--- a/res/layout-sw600dp-port/longpress_cling.xml
+++ b/res/layout-sw600dp-port/longpress_cling.xml
@@ -4,6 +4,7 @@
     android:id="@+id/longpress_cling"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/cling_scrim_background"
     android:orientation="vertical" >
 
     <Space
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7ddb1e47f..29837eaf7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,6 +22,7 @@
          over the delete target or the info target -->
     <color name="delete_target_hover_tint">#DAFF0000</color>
     <color name="info_target_hover_tint">#DA0099CC</color>
+    <color name="cling_scrim_background">#80000000</color>
 
     <color name="bubble_dark_background">#20000000</color>
     <color name="focused_background">#80c6c5c5</color>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7098760b3..37a7f5cc8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -73,6 +73,7 @@ import android.text.TextUtils;
 import android.text.method.TextKeyListener;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.ContextThemeWrapper;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
@@ -2555,7 +2556,7 @@ public class Launcher extends Activity
 
     private void showBrokenAppInstallDialog(final String packageName,
             DialogInterface.OnClickListener onSearchClickListener) {
-        new AlertDialog.Builder(this)
+        new AlertDialog.Builder(new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault))
             .setTitle(R.string.abandoned_promises_title)
             .setMessage(R.string.abandoned_promise_explanation)
             .setPositiveButton(R.string.abandoned_search, onSearchClickListener)
-- 
cgit v1.2.3