summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2014-01-1356-57/+315
| | | | | Change-Id: I6cf43d3ab8f99f3bda1fd114e2135d7c89797b11 Auto-generated-cl: translation import
* am 6279e2cd: Merge "Set App context from WallpaperChanged receiver. (Bug ↵Winson Chung2014-01-131-0/+1
|\ | | | | | | | | | | | | 12525684)" into jb-ub-now-kermit * commit '6279e2cd31f93769aca0dd78aae3bdb6760af3a8': Set App context from WallpaperChanged receiver. (Bug 12525684)
| * Merge "Set App context from WallpaperChanged receiver. (Bug 12525684)" into ↵Winson Chung2014-01-131-0/+1
| |\ | | | | | | | | | jb-ub-now-kermit
| | * Set App context from WallpaperChanged receiver. (Bug 12525684)Winson Chung2014-01-131-0/+1
| | | | | | | | | | | | Change-Id: Ie037d74d31e6b05b0ae5bb25ed1bf1c639a28a5f
* | | am 0b95b14f: Merge "Quick patch for b/12446428." into jb-ub-now-kermitDan Sandler2014-01-131-1/+4
|\| | | | | | | | | | | | | | * commit '0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5': Quick patch for b/12446428.
| * | Merge "Quick patch for b/12446428." into jb-ub-now-kermitDan Sandler2014-01-131-1/+4
| |\ \
| | * | Quick patch for b/12446428.Dan Sandler2014-01-101-1/+4
| | | | | | | | | | | | | | | | | | | | Bug: 12446428 Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0
* | | | am 5317c2b7: Updating assets and text for migration cling. (Bug 11973614)Winson Chung2014-01-109-23/+200
|\| | | | | | | | | | | | | | | | | | | * commit '5317c2b7adfbfef97edc6ad9b7e007160ef689f4': Updating assets and text for migration cling. (Bug 11973614)
| * | | Updating assets and text for migration cling. (Bug 11973614)Winson Chung2014-01-109-23/+200
| | |/ | |/| | | | | | | Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
* | | am 234b506f: Merge "Adding migration Clings. (Bug 11973614)" into ↵Winson Chung2014-01-1014-343/+807
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '234b506f4625b23172d437a2ba0b47d63cc2e3dd': Adding migration Clings. (Bug 11973614)
| * | Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermitWinson Chung2014-01-1014-343/+807
| |\ \
| | * | Adding migration Clings. (Bug 11973614)Winson Chung2014-01-1014-344/+808
| | |/ | | | | | | | | | | | | - Refactoring Launcher cling code out to LauncherClings. Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
* | | am 8b5b05b7: Merge "New launcher2 icon migration algorithm." into ↵Adam Cohen2014-01-104-6/+271
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a': New launcher2 icon migration algorithm.
| * | Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermitAdam Cohen2014-01-104-6/+271
| |\ \
| | * | New launcher2 icon migration algorithm.Dan Sandler2014-01-104-6/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user will be able to request "icon migration", which is not a direct mapping of the old workspace, but rather follows this heuristic for bringing the user's favorite icons (by dint of their existence on the workspace) into Launcher3: Workspace shortcuts are placed in lexicographic order on the workspace starting at screen 0 (leaving the bottom row of screen 0 empty to make sure there's room to move things around). Folders are preserved and their contents sorted. Duplicate icons (that is, shortcuts with the same intent, pursuant to some cleanups) are removed. Hotseat icons are migrated in their original place, unless their new location is not accommodated by the hotseat (i.e. the L3 hotseat is too small on this device), in which case they're treated like any other shortcut and tossed into the workspace. To test, turn on Launcher.ENABLE_DEBUG_INTENTS and then: $ adb shell am broadcast -a com.android.launcher3.action.DELETE_DATABASE $ adb shell am broadcast -a com.android.launcher3.action.MIGRATE_DATABASE Bug: 12416411 Change-Id: Ia5c56f36c11455867ea20a39f70210f595020a87
* | | | am 24fa33f8: Merge "Allow DISABLE_ALL_APPS to be set using a system ↵Nilesh Agrawal2014-01-1013-32/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | property." into jb-ub-now-kermit * commit '24fa33f8c7949d5e7fff4831f5903d70e1017091': Allow DISABLE_ALL_APPS to be set using a system property.
| * | | Merge "Allow DISABLE_ALL_APPS to be set using a system property." into ↵Nilesh Agrawal2014-01-1013-32/+74
| |\ \ \ | | |_|/ | |/| | | | | | jb-ub-now-kermit
| | * | Allow DISABLE_ALL_APPS to be set using a system property.Nilesh Agrawal2014-01-0913-32/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moving the property to LauncherAppState - The property is only read on dogfood builds. The property can be set using setprop or /data/local.prop Change-Id: I14c7354efb12edb93f97e81687a6f920cc634e9a
* | | | am b54a5989: Adding optional first run activity to LauncherAdam Cohen2014-01-093-13/+50
|\| | | | | | | | | | | | | | | | | | | * commit 'b54a5989a21bef4e6bac304591ca4030bfbe709d': Adding optional first run activity to Launcher
| * | | Adding optional first run activity to LauncherAdam Cohen2014-01-093-13/+50
| |/ / | | | | | | | | | Change-Id: I146927d8a065f1cf5ef5cec41c8fb4f9ad09d25c
* | | am 0259c629: Merge "Fix issue where deleting item from folder leaves extra ↵Adam Cohen2014-01-091-1/+5
|\| | | | | | | | | | | | | | | | | | | | page" into jb-ub-now-kermit * commit '0259c629cb5b280d0d9c821f8b1685707d7ba589': Fix issue where deleting item from folder leaves extra page
| * | Merge "Fix issue where deleting item from folder leaves extra page" into ↵Adam Cohen2014-01-091-1/+5
| |\ \ | | | | | | | | | | | | jb-ub-now-kermit
| | * | Fix issue where deleting item from folder leaves extra pageAdam Cohen2013-12-131-1/+5
| | | | | | | | | | | | | | | | Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
* | | | am 8661761c: better support for multiple filesChris Wren2014-01-091-9/+20
|\| | | | | | | | | | | | | | | | | | | * commit '8661761cb691d9bed446b87d55a4fa7043a3aa95': better support for multiple files
| * | | better support for multiple filesChris Wren2014-01-091-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't exit on error, just log. new verbose flag to print more information Change-Id: I5c4895a837cb8a31901aabceade3ab976abf4af0
* | | | am 33f4c2df: first backup should save things from the beginning of timeChris Wren2014-01-091-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit '33f4c2df28228f93d96e9b1d1bfad52d715d917b': first backup should save things from the beginning of time
| * | | first backup should save things from the beginning of timeChris Wren2014-01-091-2/+2
| | |/ | |/| | | | | | | | | | Bug: 12455866 Change-Id: Ie9a97ed4110e7b1ded21f609179b5d6ee7f0ead5
* | | am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermitYura2014-01-095-5/+21
|\| | | | | | | | | | | | | | * commit '0bae5b220a24541dbc69fb2cb755f303776d0a59': Moved paddingStart to -v17 folder.
| * | Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermitYura2014-01-095-5/+21
| |\ \
| | * | Moved paddingStart to -v17 folder.Yura2014-01-095-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help get us paddingStart free to be able to work on Samsung tablets, as they crash on paddingStart when it is used outside of -v17. Bug: 8166178 Change-Id: I84879257c4e463879fd6bfc322514d30c469ca30
* | | | am 872e70e0: Merge "Accounting for new Package event extras when updating ↵Winson Chung2014-01-081-7/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit * commit '872e70e0b648af572f660c2b432786ac63545e4c': Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)
| * | | Merge "Accounting for new Package event extras when updating forward-locked ↵Winson Chung2014-01-081-7/+21
| |\ \ \ | | | | | | | | | | | | | | | apps. (Bug 11855584)" into jb-ub-now-kermit
| | * | | Accounting for new Package event extras when updating forward-locked apps. ↵Winson Chung2014-01-081-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 11855584) Change-Id: I983c82a74690a9031d18d456ff43dc8750081871
* | | | | am 155f3bc6: Merge "KEYCODE_MENU: hide all apps when entering overview mode" ↵Dan Sandler2014-01-081-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-ub-now-kermit * commit '155f3bc69b79009c95dfd34aed4db6580ad15e27': KEYCODE_MENU: hide all apps when entering overview mode
| * | | | Merge "KEYCODE_MENU: hide all apps when entering overview mode" into ↵Dan Sandler2014-01-081-3/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jb-ub-now-kermit
| | * | | | KEYCODE_MENU: hide all apps when entering overview modeDan Sandler2014-01-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12165618 Change-Id: I7ee652012c7f7b8e6fab3d9d1f99cf22484f3182
* | | | | | am 29e619c8: Merge "Remove a non-obvious fall through in a switch ↵Mihail Dumitrescu2014-01-081-7/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement." into jb-ub-now-kermit * commit '29e619c8545dcc898846f6d2a58adda14c9da03a': Remove a non-obvious fall through in a switch statement.
| * | | | | Merge "Remove a non-obvious fall through in a switch statement." into ↵Mihail Dumitrescu2014-01-071-7/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | jb-ub-now-kermit
| | * | | | Remove a non-obvious fall through in a switch statement.Mihail Dumitrescu2014-01-071-7/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL does not modify the result of calling onInterceptHoverEvent() assuming isEventOverFolder() has no side effects. The only change is that isEventOverFolder will now be called once rather than twice when action == MotionEvent.ACTION_HOVER_ENTER and isOverFolder == true. Change-Id: Icc28ab880cf5094e49f51d72035891e924cb2031
* | | | | am 83b0da1a: Removed paddingStart and paddingEnd when they are the same.Yura2014-01-088-26/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '83b0da1aed13b20562039ea00d68791beb46a090': Removed paddingStart and paddingEnd when they are the same.
| * | | | Removed paddingStart and paddingEnd when they are the same.Yura2014-01-078-26/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help get us paddingStart free to be able to work on Samsung tablets, as they crash on paddingStart when it is used outside of -v17. Bug: 8166178 Change-Id: Ic0ea256aabb68b654a3942dd19dd30e67f1b2af9
* | | | am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." ↵Nilesh Agrawal2014-01-032-4/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-ub-now-kermit * commit '579c8433f968fd8235527865797f8d58c20487da': Allow scrolling folders in when all apps is disabled.
| * | | Merge "Allow scrolling folders in when all apps is disabled." into ↵Nilesh Agrawal2014-01-032-4/+15
| |\ \ \ | | |/ / | |/| | | | | | jb-ub-now-kermit
| | * | Allow scrolling folders in when all apps is disabled.Nilesh Agrawal2014-01-022-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows for more items to be added into a folder. Allows for scrolling by letting the content area inside the scroll view to be taller. The height of content area was capped in https://googleplex-android-review.git.corp.google.com/#/c/387583/ Change-Id: I8d7950ac9c155e26c5a299c17ae6a2bbf829dce6
* | | | am 8d36ffe5: Merge "Allow changing search bar hint in the cling on-the-fly" ↵Sandeep Siddhartha2014-01-031-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-ub-now-kermit * commit '8d36ffe55285fce9f0485d72a0b3f5dc73b9f5e2': Allow changing search bar hint in the cling on-the-fly
| * | | Merge "Allow changing search bar hint in the cling on-the-fly" into ↵Sandeep Siddhartha2014-01-031-0/+14
| |\ \ \ | | |/ / | |/| | | | | | jb-ub-now-kermit
| | * | Allow changing search bar hint in the cling on-the-flySandeep Siddhartha2013-12-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This allows GEL to initially supply an empty string if hotword isn't active, and later on update the cling if and when the hotword becomes active. - This isn't expensive as it'll only be called if Launcher first calls getFirstRunClingSearchBarHint, i.e. once every fresh install/clear data Bug: 11116105 Change-Id: Ia963bb62d7b331afd0c34adfa6c4b6bdbac48349
* | | | am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import ↵Baligh Uddin2013-12-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '72b4c7c3df6be428e543c2a28f9b325e0e6d9f2b': Import translations. DO NOT MERGE
| * | | am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '3e6b26daba924fb88e20855210e0a96e2ab0ac37': Import translations. DO NOT MERGE
| | * \ \ am cff2d6a2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-260-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cff2d6a2d904b7d88096650021aa428cfdc08632': Import translations. DO NOT MERGE