Backport transparent QsbConnector

amirzaidi · Aug 25, 2017 · d199f13 · d199f13 · Rizwanmohdd · Aug 26, 2017
1 parent 0664e5e
commit d199f13
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/res/drawable/bg_pixel_qsb_connector.xml b/res/drawable/bg_pixel_qsb_connector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@android:color/transparent"
+        android:endColor="@color/qsb_connector_gradient_end_color"
+        android:angle="0.0"
+        android:right="@dimen/qsb_connector_gradient_end_padding" />
+</shape>
diff --git a/res/values/colors.xml b/res/values/colors.xml
@@ -58,4 +58,5 @@
 
     <color name="qsb_connector">#fff2f2f2</color>
     <color name="qsb_background">#ffffffff</color>
+    <color name="qsb_connector_gradient_end_color">#66ffffff</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
@@ -224,4 +224,5 @@
     <dimen name="qsb_touch_extension">20.0dip</dimen>
     <dimen name="qsb_shadow_blur_radius">1.0dip</dimen>
     <dimen name="qsb_key_shadow_offset">1.0dip</dimen>
+    <dimen name="qsb_connector_gradient_end_padding">20.0dip</dimen>
 </resources>
diff --git a/src/com/android/launcher3/pixel/QsbConnector.java b/src/com/android/launcher3/pixel/QsbConnector.java
@@ -56,28 +56,7 @@ private void stopRevealAnimation() {
     }
 
     private void retrieveGoogleQsbBackground() {
-        Drawable drawable = null;
-        try {
-            final Context context = this.getContext();
-            final Resources resourcesForApplication = context.getPackageManager().getResourcesForApplication("com.google.android.googlequicksearchbox");
-            final int identifier = resourcesForApplication.getIdentifier("bg_pixel_qsb_connector", "drawable", "com.google.android.googlequicksearchbox");
-            if (identifier == 0) {
-                return;
-            }
-            final Context context2 = this.getContext();
-            try {
-                drawable = resourcesForApplication.getDrawable(identifier, context2.getTheme());
-                if (drawable == null) {
-                    this.setBackgroundResource(R.color.qsb_connector);
-                    return;
-                }
-            }
-            catch (Exception ex) {
-                Log.d("QsbConnector", "Error loading connector background", ex);
-            }
-        }
-        catch (Exception ex3) {}
-        this.setBackground(drawable);
+        this.setBackground(getResources().getDrawable(R.drawable.bg_pixel_qsb_connector, getContext().getTheme()));
     }
 
     private void updateAlpha(final int m) {