diff options
author | Winson Chung <winsonc@google.com> | 2015-08-05 21:19:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 21:19:04 +0000 |
commit | 7573123c0518f338895d59ada6ec4a8e170f5bf5 (patch) | |
tree | 3a2c68779064ee14e29e746a41dcdc27b0d47c5b | |
parent | a2a039b66f05a1164f954387b1c12a8fb4063e92 (diff) | |
parent | a1f79d3e16362d16c06b18fd5a06d93be9bbf1fd (diff) | |
download | android_packages_apps_Trebuchet-7573123c0518f338895d59ada6ec4a8e170f5bf5.tar.gz android_packages_apps_Trebuchet-7573123c0518f338895d59ada6ec4a8e170f5bf5.tar.bz2 android_packages_apps_Trebuchet-7573123c0518f338895d59ada6ec4a8e170f5bf5.zip |
Merge "Fixing invisible search bar" into ub-launcher3-burnaby
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 9d04770af..32e7ee681 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) { |