summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge "Inform users when "Set wallpaper" fails." into ↵Tony Wickham2015-09-252-2/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish
| | * | | | Inform users when "Set wallpaper" fails.Tony Wickham2015-09-252-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23716897 Change-Id: I06cd63d9ee869235c6a4c3140e574bf4c710454e
* | | | | | am d21301e6: Cancelling the stateannouncer when entering button drop targetSunny Goyal2015-09-252-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd21301e674377ecd72bd14f32b52c68fabcfd3be': Cancelling the stateannouncer when entering button drop target
| * | | | | Cancelling the stateannouncer when entering button drop targetSunny Goyal2015-09-252-0/+7
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: Ia10298e1d4862fc5f46894fa6d934207d6e9c117
* | | | | Fixing string.format missed in previous conflict resolutionSunny Goyal2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic71ee97c319bb9141f70acf75f2fe0e40565f692
* | | | | resolved conflicts for e78e3d73 to ub-launcher3-masterSunny Goyal2015-09-2514-69/+206
|\| | | | | | | | | | | | | | | | | | | Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6
| * | | | Accessibility fixesSunny Goyal2015-09-2514-64/+204
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Use a different content description for temporary new page 2) Use different accessibility description for add widget toast 3) Announce when an item is deleted 4) Announce when hovering over a drop target 5) Announce state during drag-n-drop and widget resize (similar to seekbar) Bug: 23573321, 24057944 Change-Id: Icabb317625e70c78e11c0b4f99b9339172d93594
* | | | am 2949fb5b: Fixing talk-back folder icon removal regression.Winson2015-09-245-11/+10
|\| | | | | | | | | | | | | | | | | | | * commit '2949fb5b16a07259e221c5c04470e90c8afb4ea8': Fixing talk-back folder icon removal regression.
| * | | Fixing talk-back folder icon removal regression.Winson2015-09-245-11/+10
| | | | | | | | | | | | | | | | Change-Id: I0b7fff645828d5198500973f1c9ea74f406a1a43
* | | | am 122a753d: Adding small padding between icons in AllApps.Winson2015-09-231-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit '122a753dab209aca4b34210d749262a9ccf434c1': Adding small padding between icons in AllApps.
| * | | Adding small padding between icons in AllApps.Winson2015-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 23948851 Change-Id: If7daf84be0c5b314c5afd896d2601028ee243c80
* | | | am f27cb0e6: resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polishSunny Goyal2015-09-235-18/+21
|\| | | | | | | | | | | | | | | | | | | * commit 'f27cb0e6b1edb2a53de64fdd12d25f400a3acdd9': Using custom threadpool executor instead of the one defined in AsyncTask
| * | | resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polishSunny Goyal2015-09-235-19/+21
| |\| | | | | | | | | | | | | | Change-Id: I34e679bae7faae3c7ca725263fe6cc7c5611e63a
| | * | Using custom threadpool executor instead of the one defined in AsyncTaskSunny Goyal2015-09-236-19/+21
| | | | | | | | | | | | | | | | Change-Id: I8fe95d932c5de14c74f0576bfc3d1f641d12b448
* | | | am 5a7a1ce0: Merge "Fixing workspace state issue with option menu." into ↵Winson Chung2015-09-232-16/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish * commit '5a7a1ce0a7affdff02029793ac24b2581075acee': Fixing workspace state issue with option menu.
| * | | Merge "Fixing workspace state issue with option menu." into ↵Winson Chung2015-09-232-16/+29
| |\ \ \ | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish
| | * | | Fixing workspace state issue with option menu.Winson2015-09-222-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Hitting a ctrl key combo will actually call onPrepareOptionsMenu(), which will change the state of the workspace incorrectly. Instead, listen for the menu button, and only allow the user to enter overview mode if they are currently not dragging or in an overlay state (like all apps or widgets). - Also making the overview buttons focusable so that they are focused when you go into overview mode. Bug: 22483367 Change-Id: Ie6e9febd8a5a4e7ad25d745639d42d1c7b9801b4
* | | | | am 4c67dce4: am ce0a8946: Merge "Preventing nullpointer exception when ↵Sunny Goyal2015-09-231-9/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloning rawList" into ub-launcher3-burnaby * commit '4c67dce43f6e4f535bfe9c6d804db0822ac6db9d': Preventing nullpointer exception when cloning rawList
| * | | | am ce0a8946: Merge "Preventing nullpointer exception when cloning rawList" ↵Sunny Goyal2015-09-231-9/+11
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into ub-launcher3-burnaby * commit 'ce0a89461a7e72917c052844f8e9339d2047b1d0': Preventing nullpointer exception when cloning rawList
| | * | | Merge "Preventing nullpointer exception when cloning rawList" into ↵Sunny Goyal2015-09-231-9/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | Preventing nullpointer exception when cloning rawListSunny Goyal2015-09-221-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24299525 Change-Id: I92018a3da7d75afc2c6997302f8e0492eb78e62f
* | | | | | am e4d16e41: am 7ca99110: Using an executor with increased queue size for ↵Sunny Goyal2015-09-231-1/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading previews * commit 'e4d16e41e9414f975ce78ed19b8e3616cd59a744': Using an executor with increased queue size for loading previews
| * | | | | am 7ca99110: Using an executor with increased queue size for loading previewsSunny Goyal2015-09-231-1/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ca991104e3ac2e99fcde5599416f82b4d66aad1': Using an executor with increased queue size for loading previews
| | * | | | Using an executor with increased queue size for loading previewsSunny Goyal2015-09-231-1/+14
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An async task can be in the queue even if it has been cancelled. It is removed only after it gets executed once. So the executor can get blocked if there are some tasks which are running, and we keep posting and cancelling preview load tasks. Bug: 24306650 Change-Id: I836c8d53258542cc6f31952dff84323cc057437c
* | | | | Fixing merge into ub-launcher3-masterTony Wickham2015-09-221-0/+3
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ifd9128c72f6e11855b1bb9272c6f193d688ba021
| * | | | Merge "Show a spinner while wallpaper is being cropped." into ↵Tony Wickham2015-09-231-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish
| | * | | | Show a spinner while wallpaper is being cropped.Tony Wickham2015-09-221-0/+3
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 23599411 Change-Id: I6c5f75554fd59b7caa3a61f1b11b4a2a6aa21e7c
* | | | | am ff9133f1: Adjust cropped bitmap bounds to correctly fit in original ↵Tony Wickham2015-09-231-10/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap bounds. * commit 'ff9133f1125865f4e14a92d4b5e661f1ac92524d': Adjust cropped bitmap bounds to correctly fit in original bitmap bounds.
| * | | | Adjust cropped bitmap bounds to correctly fit in original bitmap bounds.Tony Wickham2015-09-231-10/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 22631531 Change-Id: Ia0c1bccf4b8af3a8b335b865974c5d08f9836689
* | | | Merge "Moving a few testing classes to a separate package" into ↵Sunny Goyal2015-09-2114-154/+197
|\ \ \ \ | | | | | | | | | | | | | | | ub-launcher3-master
| * | | | Moving a few testing classes to a separate packageSunny Goyal2015-08-1914-154/+197
| | | | | | | | | | | | | | | | | | | | Change-Id: Ied1c063de3e938695493e4937f554686e0719dad
* | | | | am 9ae42fff: am b3fff9d9: Merge "Cleanup some incorrect / noisey calls to ↵Adam Cohen2015-09-212-3/+16
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | CustomContentCallbacks#onShow / onHide" into ub-launcher3-burnaby * commit '9ae42fff6f481ea2a06f171da43f630ded313b69': Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHide
| * | | | am b3fff9d9: Merge "Cleanup some incorrect / noisey calls to ↵Adam Cohen2015-09-212-3/+16
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | CustomContentCallbacks#onShow / onHide" into ub-launcher3-burnaby * commit 'b3fff9d98a3e3c886d4efa912d7ad6753dd7ec9c': Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHide
| | * | | Merge "Cleanup some incorrect / noisey calls to ↵Adam Cohen2015-09-212-3/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | CustomContentCallbacks#onShow / onHide" into ub-launcher3-burnaby
| | | * | | Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHideAdam Cohen2015-09-182-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> In some instances, onResume would incorrectly call onShow -> When pressing Home from CustomContent, we'd get a sequence of onHide, onShow, and then onHide due to some deferred actions in onNewIntent. Got rid of the onShow. issue 17629011 Change-Id: I9b4f2ef682f5a7060e68210866fa05452076e428
* | | | | | am ed10c013: am 36bde9a9: Merge "Add fake CustomContent screen for testing ↵Adam Cohen2015-09-191-2/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Launcher interface" into ub-launcher3-burnaby * commit 'ed10c013bd6f6775cd6bb834283303deed55daa7': Add fake CustomContent screen for testing Launcher interface
| * | | | | am 36bde9a9: Merge "Add fake CustomContent screen for testing Launcher ↵Adam Cohen2015-09-191-2/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface" into ub-launcher3-burnaby * commit '36bde9a9e50412329237081e595d732b7da93e0b': Add fake CustomContent screen for testing Launcher interface
| | * | | | Merge "Add fake CustomContent screen for testing Launcher interface" into ↵Adam Cohen2015-09-191-2/+30
| | |\| | | | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | Add fake CustomContent screen for testing Launcher interfaceAdam Cohen2015-09-181-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f2aee1768fe59ee3079d069ff0be21cdf9282ea
* | | | | | am 20bd2c10: (-s ours) am 6ed058cb: Wallpaper preview parallax matches the ↵Tony Wickham2015-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual wallpaper\'s. * commit '20bd2c10c1d5ead86f472a7397f060159693e4f4': Wallpaper preview parallax matches the actual wallpaper's.
| * | | | | am 6ed058cb: Wallpaper preview parallax matches the actual wallpaper\'s.Tony Wickham2015-09-181-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ed058cb6bfbb5756721e0d7f4a80a1c08ee665c': Wallpaper preview parallax matches the actual wallpaper's.
| | * | | | Wallpaper preview parallax matches the actual wallpaper's.Tony Wickham2015-09-188-56/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry picking the following changes from ub-launcher3-master: Change-Id: I41c5bbbfdabfeb4e20d77e9b5804842a03211edf Change-Id: I69afa3f8cc59c77e9c4c25e29e8db8c4beb87462 Change-Id: I82b7ba506d51ee4b3812af5fbdf95d3303b37aef Change-Id: Id7c2b5483c5535d59be2f8a459ce7788e3c8318a Bug: 23568800 Change-Id: I343169b9fdc5ceaab3d4b39044627d78b7267868 (cherry picked from commit 3e776a87dc5178ab7d2c31a8db06fe5657db4e4a)
* | | | | | Show App Info when dragging widgets from the workspace.Tony Wickham2015-09-182-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24190195 Change-Id: I65f67b7c1a1ae895035942aa97e40186ea5a206f
* | | | | | Merge "Ensure that setting a wallpaper snaps to a page." into ↵Tony Wickham2015-09-181-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ub-launcher3-master
| * | | | | | Ensure that setting a wallpaper snaps to a page.Tony Wickham2015-09-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was possible to end in a sort of limbo state between pages if the user free scrolled in the overview before entering the wallpaper picker. Bug: 23829077 Change-Id: I2837fb46f092efac3b3274043378431963e6eabc
* | | | | | | am a3c9fb12: Merge "Requiring key chord to delete icons and folders on the ↵Winson Chung2015-09-186-32/+74
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workspace" into ub-launcher3-burnaby-polish * commit 'a3c9fb125c7449df5add990e91e0e3471e3cc776': Requiring key chord to delete icons and folders on the workspace
| * | | | | | Merge "Requiring key chord to delete icons and folders on the workspace" ↵Winson Chung2015-09-186-32/+74
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into ub-launcher3-burnaby-polish
| | * | | | | | Requiring key chord to delete icons and folders on the workspaceWinson2015-09-146-32/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also fixing case where the all apps button to search for more apps was not focusable Bug: 20639227 Change-Id: Ie4d9092e654d3cafc0eb346b3bb744ec3e295e92
* | | | | | | | am 77f67072: am 605156bd: Fixing crash on pre-api level 19 devices due to ↵Winson2015-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getAlpha() call on Drawable. * commit '77f670721d2ee1ff806eccf9b79dbeffc660a464':
| * | | | | | | am 605156bd: Fixing crash on pre-api level 19 devices due to getAlpha() call ↵Winson2015-09-181-1/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Drawable. * commit '605156bd87345beef31bf9164e85fbfc8a1cfc08': Fixing crash on pre-api level 19 devices due to getAlpha() call on Drawable.