Merging ub-launcher3-master, build 5887983
Test: Manual
Bug:113287687 P3 App shortcut overlapping app icon when selecting the app using USB mouse.
Bug:113952590 P2 [STOP SHIP BUG] WM Experiment: Slim the navigation bar
Bug:114136250 P1 Have a more spartan RecentsActivity on android go
Bug:122333437 P2 Mk2bp: packages/apps/Launcher3
Bug:123298377 P4 App shortcut menu does not close after launching from hotseat while that app is in splitscreen
Bug:124817089 P4 Uninstalling an app doesn't remove the icon(s)
Bug:124967099 P2 Support 5 column layout for all apps (independent of what the workspace layout is)
Bug:125027540 P2 Apps to be searchable in different languages
Bug:126587956 P2 Create an app to use with Launcher testing
Bug:127689526 P2 [icons] hourglass_bottom and hourglass_top
Bug:129497226 P2 Remove setInteractionState from the contract
Bug:130225926 P2 Cannot unpin app while in gesture nav
Bug:130272454 P1 [C1/B1] Message app crash when opening a video MMS.
Bug:130440957 P2 Recents Go view visibility not updating while loading UI is up
Bug:130580680 P2 Recents Go does not load views right after boot
Bug:130635650 P2 Recents Go thumbnails not updating on app => recents transition
Bug:130740246 P2 Recents Go crashes from ViewTreeObserver being dead
Bug:130746661 P2 Fix NPE for getting task from loading task UI in Recents Go
Bug:130820737 P2 Recents Go remove animation doesn't always work
Bug:131095241 P2 Recents Go should support landscape app => landscape thumbnail transition
Bug:132336512 P2 Notification dots on pinned shortcuts
Bug:132461400 P1 Fatal exceptions in Launcher3
Bug:134712476 P4 Add Duo contact to home screen, icon froze and vanished while over home screen
Bug:135419782 P2 [Q-Preview4] "Freeform" feature on developer options keeps crashing
Bug:135633159 P3 [QPR] Promise icons on home screen
Bug:135684365 P1 Build error when building from Android Studio
Bug:135687618 P4 Task shows between back and swiping up to overview
Bug:135864059 P4 [Live Tiles] Empty launcher
Bug:137200188 P3 Home screen app title disappears during animation
Bug:137404499 P4 Don't persist invalid previews to cache
Bug:137568159 P4 Refactor LauncherCallback to support multiple clients
Bug:137653564 P2 Support Agassi (Search Engine choice) in Android R
Bug:138195597 P2 Wrong icon animated on return to home screen
Bug:139020180 P4 Add a "Dismiss" option for predicted apps in Launcher
Bug:139021165 P2 [TEST TRACKER] [QPR] Promise icons on home screen
Bug:139051851 P2 Optimize folder binding
Bug:139137636 P2 Create memory tests for Launcher
Bug:139281702 P2 [Enterprise - Cloud DO] GSOC and Mobile Utilities launcher icons are in broken state
Bug:139436782 P4 Sorting people by key crashes launcher
Bug:139540363 P1 Launcher goes in crash loop
Bug:139551306 P4 [Polish] Reduce shelf paddings in Overview
Bug:139703885 P4 Add support for searchwidget in layout files.
Bug:139880994 P1 RequestPinItemTest is broken
Bug:139885365 P3 App open animation different between launcher suggested apps and launcher home screen/drawer
Bug:139888225 P2 Convert custom widget into plugins
Bug:139893571 P4 Light QSB to Dark QSB transition lags
Bug:139913027 P2 [a11y] App title in Widget list shouldn't be actionable by a11y methods. (It would cause Pixel launcher crash.)
Bug:139942462 P1 Dragging an icon from prediction row to workspace crashes launcher
Bug:140230739 P4 Android Q update missed home screen shortcut
Bug:140242324 P2 Cache shortcutInfo icons in Launcher
Bug:140243695 P4 Add plugin around UserEventDispatcher
Bug:140244969 P4 Investigate flickerlib for sysui/launcher
Bug:140246642 P4 Add binder tests for launcher interactions
Bug:140405990 P2 [a11y] Unable to add shortcut to Home screen by Voice access or Switch access.
Bug:140406263 P2 [a11y] Unable to scroll to the left of the main Home screen to Display google app by Voice access or Switch access.
Bug:140633033 P4 Reduces calls to get default display
Bug:140749967 P2 Add gesture nav tests for 3P launcher support
Bug:140771636 P2 ub-launcher-master should track R API
Bug:140819317 P4 Pixel launcher crashing
Bug:140837771 P1 Failing test: AddConfigWidgetTests and AddWidgetTests are failing
Bug:141024521 P2 Tapping nav bar during quick switch causes scroll animation to cancel and not resume
Bug:141184247 P1 Clear all button not present in fallback recents in 3-button mode
Bug:141279939 P1 LauncherAppWidgetHost.onAppWidgetRemoved not compatible with master
Bug:64712476 P3 Import translations for dev branches
Bug:78611156 P4 Default name's language of folder won't change after changing the system language
Bug:79164903 P4 With work profile added, unable to scroll through the apps vertically using Mouse wheel
Bug:79462255 P3 Disabling cross profile widget provider doesn't remove widget (until you interact with it)
Bug:issue priority summary
Change-Id: I9c36a901e5b3625ae6c5c86d1bd82d90ec784c56
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b2c5266..f58158f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3QuickStep)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
index fc7d6b3..e1b71a0 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
@@ -168,22 +168,19 @@
mCanvas.setBitmap(null);
}
- final Bitmap result;
- if (user != null && !Process.myUserHandle().equals(user)) {
+ if (isInstantApp) {
+ badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
+ }
+ if (user != null) {
BitmapDrawable drawable = new FixedSizeBitmapDrawable(bitmap);
Drawable badged = mPm.getUserBadgedIcon(drawable, user);
if (badged instanceof BitmapDrawable) {
- result = ((BitmapDrawable) badged).getBitmap();
+ bitmap = ((BitmapDrawable) badged).getBitmap();
} else {
- result = createIconBitmap(badged, 1f);
+ bitmap = createIconBitmap(badged, 1f);
}
- } else if (isInstantApp) {
- badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
- result = bitmap;
- } else {
- result = bitmap;
}
- return BitmapInfo.fromBitmap(result, mDisableColorExtractor ? null : mColorExtractor);
+ return BitmapInfo.fromBitmap(bitmap, mDisableColorExtractor ? null : mColorExtractor);
}
public Bitmap createScaledBitmapWithoutShadow(Drawable icon, boolean shrinkNonAdaptiveIcons) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index 4857d00..fd216b9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -116,4 +116,5 @@
mActivity.dispatchKeyEvent(ev);
}
}
-}
\ No newline at end of file
+}
+
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
index cae273a..90989fe 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -431,3 +431,4 @@
}
}
}
+