Merge "Allow app pairs in folders" into 24D1-dev
This commit is contained in:
commit
559aeb2c45
28 files changed
+454
-233
No files matched your search
@@ -153,7 +153,7 @@ public class AppPairsController {
|
||||
|
||||
IconCache iconCache = LauncherAppState.getInstance(mContext).getIconCache();
|
||||
MODEL_EXECUTOR.execute(() -> {
|
||||
newAppPair.getContents().forEach(member -> {
|
||||
newAppPair.getAppContents().forEach(member -> {
|
||||
member.title = "";
|
||||
member.bitmap = iconCache.getDefaultIcon(newAppPair.user);
|
||||
iconCache.getTitleAndIcon(member, member.usingLowResIcon());
|
||||
|
||||
@@ -671,6 +671,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
|
||||
appIcon2,
|
||||
dividerPos
|
||||
)
|
||||
floatingView.bringToFront()
|
||||
|
||||
// Launcher animation: animate the floating view, expanding to fill the display surface
|
||||
progressUpdater.addUpdateListener(
|
||||
|
||||
Reference in new issue
Block a user