summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
Commit message (Collapse)AuthorAgeFilesLines
* Launcher state management cleanupSunny Goyal2017-10-173-19/+8
| | | | | | | | | | > Removing Widgets and related states > Fixing different durations being used when opening/closing all-apps > Removing some unnecessary object allocations when changing state without animation > Differentiating widget bootm sheel and full sheet in logs Bug: 67678570 Change-Id: Ic169528736d04ee0b38564b4f96595ba066eabda
* Cleaning up drag state management.Sunny Goyal2017-10-162-30/+9
| | | | | | | | | When the drag is started, the UI automatically goes into spring loaded mode. On a successful drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode. Bug: 34692289 Change-Id: Ic611739a43bb8d9279b587aaee3039326c143e8b
* Merge "Merging duplicate logic for deferred drop handling in Worksace and ↵TreeHugger Robot2017-10-061-39/+6
|\ | | | | | | Folder" into ub-launcher3-master
| * Merging duplicate logic for deferred drop handling in Worksace and FolderSunny Goyal2017-10-061-39/+6
| | | | | | | | | | | | | | | | > All the logic is contained in UninstallDropTarget > Also fixing a bug were mWaitingForResume was not cleared Bug: 34692289 Change-Id: I617475ce53062902d6817954fb608198e6e03d3c
* | Merge "Polish animation when icon returns to Folder." into ub-launcher3-masterTreeHugger Robot2017-10-053-25/+43
|\ \ | |/ |/|
| * Polish animation when icon returns to Folder.Jon Miranda2017-09-113-25/+43
| | | | | | | | | | | | | | | | ie. The animation when the user drags an icon from a Folder to a full workspace/hotseat. Bug: 31443188 Change-Id: If51b23cd8fc822543ac3f550f9fd2e48dd58e0e9
* | Removing some methods from the DragSourceSunny Goyal2017-10-031-15/+1
| | | | | | | | | | | | | | This makes is easier to create new DragSource and sets up proper default values in DragOptions Change-Id: I6cb0b1df41b9730cf29f785fe85fe7f0b573ee3a
* | Allowing the widgetBottomSheet to be draggedSunny Goyal2017-10-021-7/+42
|/ | | | | | | | | | | | | even when the touch is started from outside the panel Removing various instanceOf checks in onNewIntent and onBackPress and moving all the corresponding logging in the FloatingView This simplifies handling of panel specific log and avoids missing a particular panel type in the if-else statement. Bug: 64751884 Bug: 64751923 Change-Id: I98f5aae18560a64be73c9efcf495479740d49a00
* Removing some folder customization optionsSunny Goyal2017-09-088-498/+61
| | | | | | | | | The old folder preview and animation relied on creating bitmaps for transition. As we move to hardware bitmaps, creating custom bitmaps which rely on icon bitmaps would be costly (hardware bitmaps are immutable and cannot be drawn on a software canvas). Bug: 35428783 Change-Id: I39869ed44feb6a886985ad15775bc1ab55565727
* Fix bug where dragging app from Search breaks Folder preview.Jon Miranda2017-08-301-0/+4
| | | | | Bug: 64975940 Change-Id: I3182a9396aa1e34bc3489f794f2de40387c50da3
* Merge "Adding spring effect for folder icons when dragging similar to ↵Sunny Goyal2017-07-263-11/+33
|\ | | | | | | adaptive icons" into ub-launcher3-dorval-polish2
| * Adding spring effect for folder icons when dragging similar to adaptive iconsSunny Goyal2017-07-253-11/+33
| | | | | | | | | | Bug: 63889144 Change-Id: Idd1fd13c6343bf3e0a3a0e5ff0be730d41996575
* | Revert "Update Folders to match spec."Jonathan Miranda2017-07-261-6/+3
|/ | | | | | This reverts commit fd8fa136f5cec15302bf48bdd60761e057f960c4. Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1
* Fix bug when dragging FolderIcon between Workspace/Hotseat.Jon Miranda2017-07-242-4/+7
| | | | | Bug: 63902464 Change-Id: I7995295d5c350720030abc6651af681c880464f8
* Update Folders to match spec.Jon Miranda2017-07-201-3/+6
| | | | | Bug: 63825895 Change-Id: Ia1a139f1afd944eefcd370645142227317e2bf20
* Merge "Decrease the animation delay when closing Folder from 2+ page." into ↵TreeHugger Robot2017-07-181-1/+1
|\ | | | | | | ub-launcher3-dorval-polish
| * Decrease the animation delay when closing Folder from 2+ page.Jon Miranda2017-07-181-1/+1
| | | | | | | | | | Bug: 36022592 Change-Id: I3ec956b354efb3836c4c3cf9baf361f763faae1f
* | Fix crash when adding PinShortcutRequestActivityInfo to Folder.Jon Miranda2017-07-181-3/+8
|/ | | | | Bug: 63770450 Change-Id: Ibc7553933a53d8af459628add7644fbaf5820cb0
* Fix bug where Folder name stayed invisible.Jon Miranda2017-07-171-0/+1
| | | | | | | Accidentally removed from Change-Id: I7ede7ed9e091e2a0c3cbe11731744bfe9ce36595 Bug: 63777585 Change-Id: I3178944285f11ab3efbd3b446c22b4b5f6843988
* Add new motion for when Folder preview changes due to onDrop.Jon Miranda2017-07-145-26/+200
| | | | | | | | | | | | | Instead of changing the display order of the Folder to preserve the upper left quadrant, we are opting to change the Folder Icon preview to always show the upper left quadrant. This means that when adding items to a Folder, the preview items may change. (They will change when the column size increases). Bug: 27944225 Bug: 63140071 Change-Id: I863c2479469d68559cab2878030c2087d48217d6
* Polish Folder open animation during drag and drop.Jon Miranda2017-07-141-10/+11
| | | | | | | | | | | | | | We now use the current FolderIcon background radius as the clipping size for the Folder, which results in a smoother hand-off between the two. Before this change, the Folder would center itself against the FolderIcon during the hand-off. This resulted in the preview items being fully-visible in the FolderIcon, to being clipped in the Folder. Bug: 63709477 Change-Id: I1da187485f28dde92d171729b011ada47a506f85
* Revert "Match items in icon preview with items in Folder using permutations."Jonathan Miranda2017-07-133-208/+72
| | | | | | This reverts commit 69c340a05e846b4b1b2d457164fd313e249df353. Change-Id: I4178b58e847a87e5cd7e5fa4b6886f0d72ba387b
* Merge "Revert "Update existing Folder items' ranks to match their ↵TreeHugger Robot2017-07-131-25/+11
|\ | | | | | | pre-permutation layouts."" into ub-launcher3-dorval-polish
| * Revert "Update existing Folder items' ranks to match their pre-permutation ↵Jonathan Miranda2017-07-131-25/+11
| | | | | | | | | | | | | | | | layouts." This reverts commit c4b296a50ea50de64b377016e07ec041350489c8. Change-Id: Ieff7873edc3cb300fe454b0ad97d6f0b4f0cb5a9
* | Slide in first page preview items in FolderIcon after Folder closes.Jon Miranda2017-07-105-40/+152
| | | | | | | | | | | | | | | | | | | | | | | | If the Folder is not closed on on the first page, we animate the current page items as if they are in the preview. When the Folder finishes closing, the first page preview items slide in as the current page preview items slide out. Bug: 36022592 Bug: 35064148 Change-Id: I7ede7ed9e091e2a0c3cbe11731744bfe9ce36595
* | Move the PreviewItem drawing/animation logic to PreviewItemManager.Jon Miranda2017-07-064-196/+261
| | | | | | | | | | | | | | | | | | We want this refactor in O-DR since we will be adding more animations: - closing from a non-first page (ag/2455887 b/36022592) - new on-drop animations *if we end up removing the permutation logic. Bug: 36022592 Change-Id: I82b8f5f5033d4fd9bd50fbe414b0fb721891d043
* | Fixing preview for newly created folder not getting clipped properly.Sunny Goyal2017-07-041-0/+2
| | | | | | | | | | | | | | | | When a new folder was created, isClipping was set to false so that the stroke is drawn behind the previewItems, but it was never reset to true. Bug: 37654209 Change-Id: I03e94008dd19d8c5a0acb61207ebac33860fdf1d
* | Add user event logging for page rearrangement and LEFT/RIGHT swipesHyunyoung Song2017-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Call logOverviewRearrange logging call ONLY when the order actually changed 2. Call logActionOnContainer when containers are swiped. Bug: 32457561 Bug: 32457561 06-30 11:23:04.082 6585 6585 D UserEvent: action:SWIPE direction=LEFT 06-30 11:23:04.082 6585 6585 D UserEvent: Source child:WORKSPACE id=2 06-30 11:23:04.082 6585 6585 D UserEvent: Elapsed container 50436 ms session 50436 ms action 0 ms 06-30 11:23:04.082 6585 6585 D UserEvent: isInLandscapeMode false 06-30 11:23:04.082 6585 6585 D UserEvent: isInMultiWindowMode false 06-30 11:23:08.266 6585 6585 D UserEvent: action:SWIPE direction=LEFT 06-30 11:23:08.266 6585 6585 D UserEvent: Source child:WORKSPACE id=1 06-30 11:23:08.266 6585 6585 D UserEvent: Elapsed container 54620 ms session 54620 ms action 0 ms 06-30 11:23:08.266 6585 6585 D UserEvent: isInLandscapeMode false 06-30 11:23:08.266 6585 6585 D UserEvent: isInMultiWindowMode false 06-30 11:23:10.742 6585 6585 D UserEvent: action:SWIPE direction=LEFT 06-30 11:23:10.742 6585 6585 D UserEvent: Source child:WORKSPACE id=0 06-30 11:23:10.742 6585 6585 D UserEvent: Elapsed container 57096 ms session 57096 ms action 0 ms 06-30 11:23:10.742 6585 6585 D UserEvent: isInLandscapeMode false 06-30 11:23:10.742 6585 6585 D UserEvent: isInMultiWindowMode false 06-30 11:23:17.286 6585 6585 D UserEvent: action:SWIPE direction=RIGHT 06-30 11:23:17.286 6585 6585 D UserEvent: Source child:WORKSPACE id=-1 06-30 11:23:17.286 6585 6585 D UserEvent: Elapsed container 63639 ms session 63639 ms action 0 ms 06-30 11:23:17.286 6585 6585 D UserEvent: isInLandscapeMode false 06-30 11:23:17.286 6585 6585 D UserEvent: isInMultiWindowMode false 06-30 11:23:19.879 6585 6585 D UserEvent: action:SWIPE direction=RIGHT 06-30 11:23:19.879 6585 6585 D UserEvent: Source child:WORKSPACE id=0 06-30 11:23:19.879 6585 6585 D UserEvent: Elapsed container 66233 ms session 66233 ms action 0 ms 06-30 11:23:19.879 6585 6585 D UserEvent: isInLandscapeMode false 06-30 11:23:19.879 6585 6585 D UserEvent: isInMultiWindowMode false 06-30 11:23:23.811 6585 6585 D UserEvent: action:SWIPE direction=RIGHT 06-30 11:23:23.811 6585 6585 D UserEvent: Source child:WORKSPACE id=1 06-30 11:23:23.811 6585 6585 D UserEvent: Elapsed container 70165 ms session 70165 ms action 0 ms 06-30 11:23:23.811 6585 6585 D UserEvent: isInLandscapeMode false 06-30 11:23:23.811 6585 6585 D UserEvent: isInMultiWindowMode false Change-Id: I11a48ee44aaa87863e76ccf2b46f499c28e96748
* | Merge "Folder animation polish." into ub-launcher3-dorval-polishTreeHugger Robot2017-06-291-17/+22
|\ \ | |/ |/|
| * Folder animation polish.Jon Miranda2017-06-291-17/+22
| | | | | | | | | | | | | | | | | | | | | | * Use different interpolators so that the prevew items in large folders appear aligned with the rest of the folder contents longer (the preview item movements are less jumpy). * Fixed animation elevation on close. Bug: 63131666 Bug: 35064148 Change-Id: Iecb1a8d3105e630ee00b3ea4b692979efb928d7d
* | Update existing Folder items' ranks to match their pre-permutation layouts.Jon Miranda2017-06-281-11/+25
|/ | | | | | | | | | | | | | | | | | | With the new Folder permutation logic, we change the position of the items when they are added to a Folder. This means that existing Folders will now appear in a different order than the user arranged them in. This change makes sure that when a user upgrades, their existing Folders will appear untouched. Note: We decided to priotize restoring the original layout of the Folder, as opposed to making sure the preview items remain the same. This is less destructive of users' data (we're changing the window into the Folder, but not the location of items when the Folder is open). Bug: 63115141 Bug: 35064148 Change-Id: Ib0a28b4b50be089878ffc3e40bced89832e125bc
* Match items in icon preview with items in Folder using permutations.Jon Miranda2017-06-284-86/+208
| | | | | | | | | | | | | | Before, with the FolderIconPreviewVerifier, we would adjust which items are displayed in the FolderIcon. This caused some issues where the apps in the folder icon would jump to whatever was in the upper left quadrant. Now, we always display the 4 first items in the icon by modifying the XY positions of the items within the Folder. Bug: 27944225 Bug: 35064148 Change-Id: I46c0fbb064d4da4da155e29963bfb92b14e40f07
* Popup visual changesTony Wickham2017-06-271-2/+8
| | | | | | | | | | | - Don't remove elevation during animation (b/62905720) - Other adjustments (b/35766387) - Add "gutter" between notification and shortcuts - Change shortcuts to always be primary color (e.g. white) - Scale down shortcut icons when notifications present - Apply icon extracted color to "Notifications" header Change-Id: Idf791dc76d15d05d246000ad73810916d7cd1750
* Merge "Grid change polish bugs." into ub-launcher3-dorval-polishTreeHugger Robot2017-06-271-1/+1
|\
| * Grid change polish bugs.Jon Miranda2017-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | - Folder icons were too small in landscape. - Folders can now be 16dp away from the edge (used to be 64dp which resulted in super small folders) - Decrease page spacing back to 8dp - Decrease PreviewBackground accept scale factor since hotseat is now generally smaller. Bug: 37014334 Bug: 37015359 Change-Id: Icbb53d34136bfdb93796d48f7379da6b9e214345
* | Merge "Revert edge glow effect and restore damped overscroll" into ↵TreeHugger Robot2017-06-271-6/+0
|\ \ | | | | | | | | | ub-launcher3-dorval-polish
| * | Revert edge glow effect and restore damped overscrollAdam Cohen2017-06-271-6/+0
| |/ | | | | | | | | | | Bug 62628421 Change-Id: Iab6ac567e98e63ade34de8817c3ae1f58c25ba19
* | Merge "Fix Folder text animation bugs." into ub-launcher3-dorval-polishTreeHugger Robot2017-06-261-0/+1
|\ \
| * | Fix Folder text animation bugs.Jon Miranda2017-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The Folder text was not getting reset back to visible on close. * DoubleShadowBubbleTextView now draws the shadow using the alpha of the current text. Bug: 62967568 Bug: 35064148 Change-Id: Iea3e5275b6878fc362150e99a225ff700b946f44
* | | Animate Folder elevation halfway thru transition.Jon Miranda2017-06-261-7/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation had the Folder elevation animate in after the Folder transition was done completing. To make it appear more smooth, we animate the Folder elevation halfway thru the transition. We will keep the separate FolderIcon shadow fade-in animation on the closing transition otherwise the shadow will be apparent in the "preview." Bug: 62787582 Bug: 35064148 Change-Id: Ifd3d84214b0600b6651005c8e65d90b0d8ade422
* / Move inner classes out of FolderIcon.Jon Miranda2017-06-256-132/+163
|/ | | | | | | | | The goal is to eventually move all of the PreviewBackground and Preview Item drawing out of the FolderIcon class. Bug: 36022592 Change-Id: Ie0552bb4ca8a7e232c1c454a23558940e9394a14
* Fixing two different implementations for animating text alphaSunny Goyal2017-06-231-25/+14
| | | | | | | The animator in BubbleTextView maintains an internal state which was getting invalidated by the FolderAnimator. Change-Id: I53885fe8f1773ca62fe59f1712056f02ff9a749f
* Move PreviewBackground into its own class file.Jon Miranda2017-06-223-402/+431
| | | | | | | | | | This is done in preparation for new PreviewBackground animation where we will be animating in the first page preview items when closing the Folder from a non-first page. Bug: 36022592 Bug: 35064148 Change-Id: Id4d54da16ddfa852ca639a2dc8d328307d4d443a
* Merge "Setting the callback for previewItems to folderIcon. This allows the ↵Sunny Goyal2017-06-224-32/+39
|\ | | | | | | FolderIcon to get updated without going through the child'draw pass. Also simplifying the draw code for the FolderIcon to remove any cycling invalidate calls" into ub-launcher3-dorval-polish
| * Setting the callback for previewItems to folderIcon. This allows the ↵Sunny Goyal2017-06-224-32/+39
| | | | | | | | | | | | | | | | | | | | FolderIcon to get updated without going through the child'draw pass. Also simplifying the draw code for the FolderIcon to remove any cycling invalidate calls Bug: 62900800 Change-Id: I17009a5347a1c3c35426313ac759e0240ce6a395
* | Merge "Removing view.isInTouchMode() because plaform returns false when ↵Mario Bertschler2017-06-221-3/+0
|\ \ | |/ |/| | | using a mouse on long click." into ub-launcher3-dorval-polish
| * Removing view.isInTouchMode() because plaform returns false whenMario Bertschler2017-06-221-3/+0
| | | | | | | | | | | | | | | | using a mouse on long click. Bug: 38204847 Change-Id: I5b10e8251f4f0a7b148c0404d5939a0fa8325a46
* | Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in ↵Rajeev Kumar2017-06-221-10/+8
|\ \ | |/ |/| | | FolderPagedView class 2. Get rid of explicit type arguments that can be inferred" into ub-launcher3-dorval-polish
| * 1. Replace use of java.util.HashMap with android.util.ArrayMap inRajeev Kumar2017-06-121-10/+8
| | | | | | | | | | | | | | | | FolderPagedView class 2. Get rid of explicit type arguments that can be inferred Bug: 62466540 Change-Id: I4f6bdc3235326b7f60fad3d29e5657122e6c5e71
* | Merge "Set mDragInProcess to false in onDragEnd." into ↵TreeHugger Robot2017-06-211-0/+1
|\ \ | | | | | | | | | ub-launcher3-dorval-polish