summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-08-05 21:19:04 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-05 21:19:04 (GMT)
commit7573123c0518f338895d59ada6ec4a8e170f5bf5 (patch)
tree3a2c68779064ee14e29e746a41dcdc27b0d47c5b
parenta2a039b66f05a1164f954387b1c12a8fb4063e92 (diff)
parenta1f79d3e16362d16c06b18fd5a06d93be9bbf1fd (diff)
downloadandroid_packages_apps_Trebuchet-7573123c0518f338895d59ada6ec4a8e170f5bf5.zip
android_packages_apps_Trebuchet-7573123c0518f338895d59ada6ec4a8e170f5bf5.tar.gz
android_packages_apps_Trebuchet-7573123c0518f338895d59ada6ec4a8e170f5bf5.tar.bz2
Merge "Fixing invisible search bar" into ub-launcher3-burnaby
-rw-r--r--src/com/android/launcher3/Launcher.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9d04770..32e7ee6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -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) {