OSDN Git Service

Merge "Fixing invisible search bar" into ub-launcher3-burnaby
authorWinson Chung <winsonc@google.com>
Wed, 5 Aug 2015 21:19:04 +0000 (21:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Aug 2015 21:19:04 +0000 (21:19 +0000)
src/com/android/launcher3/Launcher.java

index 9d04770..32e7ee6 100644 (file)
@@ -742,6 +742,7 @@ public class Launcher extends Activity
         };
 
         if (requestCode == REQUEST_BIND_APPWIDGET) {
+            // This is called only if the user did not previously have permissions to bind widgets
             final int appWidgetId = data != null ?
                     data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1) : -1;
             if (resultCode == RESULT_CANCELED) {
@@ -751,6 +752,10 @@ public class Launcher extends Activity
             } else if (resultCode == RESULT_OK) {
                 addAppWidgetImpl(appWidgetId, mPendingAddInfo, null,
                         mPendingAddWidgetInfo, ON_ACTIVITY_RESULT_ANIMATION_DELAY);
+
+                // When the user has granted permission to bind widgets, we should check to see if
+                // we can inflate the default search bar widget.
+                getOrCreateQsbBar();
             }
             return;
         } else if (requestCode == REQUEST_PICK_WALLPAPER) {