summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Allow user to place PendingAddShortcutInfo in opened Folder." into ↵Jon Miranda2017-05-225-91/+141
|\ | | | | | | | | | | | | | | ub-launcher3-dorval-polish am: 09273b676e Change-Id: Ie8594f9be8f81018b3dfc3f8bb8af02fb15ddcff
| * Merge "Allow user to place PendingAddShortcutInfo in opened Folder." into ↵TreeHugger Robot2017-05-225-91/+141
| |\ | | | | | | | | | ub-launcher3-dorval-polish
| | * Allow user to place PendingAddShortcutInfo in opened Folder.Jon Miranda2017-05-225-91/+141
| | | | | | | | | | | | | | | | | | | | | | | | Current implementation only allowed dropping PendingAddShortcutInfo on a FolderIcon. Bug: 37814579 Change-Id: Ice42421c34665b0ebf199945761c5c86614573a4
* | | Simplifying logic for managed for icon additionSunny Goyal2017-05-2211-452/+241
|\| | | | | | | | | | | | | | | | | am: a474a9bcf5 Change-Id: I03970e8ce265dd62aaa0e568cb3836fb8170ef4a
| * | Simplifying logic for managed for icon additionSunny Goyal2017-05-2211-452/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Checking for duplicate icons before adding new icons For O and above, icon addition is controlled using SessionCommitReceiver. As long as the Launcher is the default app, it will keep adding icons on the homescreen. Apps installed while launcher was not the default homescreen, no icons will be added. For below O, icons are added based on package event. As long as the Launcher process is running, it will keep adding icons on the homescreen. Apps installed while the launcher app was dead, no icons will be added. Bug: 37528649 Bug: 37082950 Bug: 34112546 Change-Id: Ic99501fa476c00474a479f2a36c24614bfa3f4bf
* | | Merge "Rename "Settings" to "Home settings"" into ub-launcher3-dorval-polishTony Wickham2017-05-221-1/+1
|\| | | | | | | | | | | | | | | | | am: 998dbecf53 Change-Id: I5fc6cc32851ed6b2d135e8a12c9d1fee478dedab
| * | Merge "Rename "Settings" to "Home settings"" into ub-launcher3-dorval-polishTony Wickham2017-05-221-1/+1
| |\ \
| | * | Rename "Settings" to "Home settings"Tony Wickham2017-05-191-1/+1
| | |/ | | | | | | | | | | | | Bug: 37903251 Change-Id: Ia6a8b329135100af9b54900e275c5362695bfd74
* | | Merge "Keep elevation during the Folder clip animation." into ↵Jon Miranda2017-05-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish am: 8b017e52da Change-Id: I5afa15cad5062d3c8b9581b816bf975f50783629
| * | Merge "Keep elevation during the Folder clip animation." into ↵TreeHugger Robot2017-05-221-1/+1
| |\ \ | | | | | | | | | | | | ub-launcher3-dorval-polish
| | * | Keep elevation during the Folder clip animation.Jon Miranda2017-05-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id2a60de89d5f0fdf6a1173a08a89b9e95e757ea4
* | | | Merge "Removing various reflection calls with final APIs" into ↵Sunny Goyal2017-05-2211-270/+138
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-dorval-polish am: b2b75b99a1 Change-Id: I00fa590aed30685927fb44537c9c12e82c03bb5d
| * | | Merge "Removing various reflection calls with final APIs" into ↵TreeHugger Robot2017-05-2211-270/+138
| |\ \ \ | | | | | | | | | | | | | | | ub-launcher3-dorval-polish
| | * | | Removing various reflection calls with final APIsSunny Goyal2017-05-2211-270/+138
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf48d6015d808f86bc79ccf64e3077eb5b6ccaff
* | | | | Minor accessibility change for app discovery item am: fc2b3d2b8aMario Bertschler2017-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e5c411e626 Change-Id: I41dabad310d14b00d407a991c35b266bf2866981
| * | | | Minor accessibility change for app discovery itemMario Bertschler2017-05-221-1/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | am: fc2b3d2b8a Change-Id: I8ebb397d368f83e7602f7f6fa6658ac89493d498
* | | | | Minor accessibility change for app discovery item am: fc2b3d2b8aMario Bertschler2017-05-221-1/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: Id6794c68e3b222152d3d7a6413bb123109bc2a36
| * | | | Minor accessibility change for app discovery itemMario Bertschler2017-05-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 38345854 Change-Id: Ib200b5a6295eb26650c7f28d0b7823b489c70cda
* | | | | Merge "Making some methods accessible" into ub-launcher3-dorval-polishSunny Goyal2017-05-194-10/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | am: 8bca47adc5 Change-Id: Idbb711e011941e33a09c05f749680b0d32e767d6
| * | | | Merge "Making some methods accessible" into ub-launcher3-dorval-polishSunny Goyal2017-05-194-10/+8
| |\ \ \ \
| | * | | | Making some methods accessibleSunny Goyal2017-05-194-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 37616877 Change-Id: I22ed43d9a39d321757d7c2fde7754b95a44780e2
* | | | | | Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval am: ↵Bill Yi2017-05-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45febfec54 -s ours am: 081fbed940 -s ours Change-Id: I8052b3deaca226f22abe7f92750455b866d14c7d
| * | | | | Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorvalBill Yi2017-05-190-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | am: 45febfec54 -s ours Change-Id: I45c8936ad2900bddc3133ffa5f105ea496d2eefb
| | * | | | Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorvalTreeHugger Robot2017-05-1889-228/+582
| | |\ \ \ \
* | | | | | | Merge "Make expanded system shortcuts clickable" into ub-launcher3-dorval ↵Tony Wickham2017-05-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 440052ce5d am: fda3107c8b Change-Id: Iddd42a9243c466f007894e8c3b04f0059ff5844f
| * | | | | | Merge "Make expanded system shortcuts clickable" into ub-launcher3-dorvalTony Wickham2017-05-191-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 440052ce5d Change-Id: I5d53a468bb4aa3060e3e7e618bfdbdb537a5aadc
| | * | | | | Merge "Make expanded system shortcuts clickable" into ub-launcher3-dorvalTreeHugger Robot2017-05-181-1/+2
| | |\ \ \ \ \
* | | | | | | | resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polishTony Wickham2017-05-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3720c69322 Change-Id: I16572c451a08359d84d8bc05e0e39dcd88b65a7e
| * | | | | | | resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polishTony Wickham2017-05-1910-22/+56
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Test: I solemnly swear I tested this conflict resolution. Change-Id: I4cdfeebd09be58270c249429104d91dc9a31b49c
| | * | | | | Merge "Update accessibility for popup" into ub-launcher3-dorvalTony Wickham2017-05-1810-23/+56
| | |\ \ \ \ \
* | | | | | | | Merge "When building Launcher3 target, LauncherDumpProto class should not be ↵Hyunyoung Song2017-05-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proguarded b/36904684" into ub-launcher3-dorval am: 904a38340c am: 4de0ddc4f1 Change-Id: I93e24c7a2d6c87f4511dc22189cb109d19212dc9
| * | | | | | | Merge "When building Launcher3 target, LauncherDumpProto class should not be ↵Hyunyoung Song2017-05-191-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proguarded b/36904684" into ub-launcher3-dorval am: 904a38340c Change-Id: I3cb282f6c78ff0c9a34e8f3ced25915fe3b96d7f
* | | | | | | | Removing workspaceLoaded check from loadDeepShortcuts() am: 4869bf3f74Sunny Goyal2017-05-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c6bfffb078 Change-Id: Ic9f92c01a8e02e7283e8395a994329c4cc311207
| * | | | | | | Removing workspaceLoaded check from loadDeepShortcuts()Sunny Goyal2017-05-191-11/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4869bf3f74 Change-Id: I1516a214df024f5e9b9387671cfadd3697384ede
* | | | | | | | | resolve merge conflicts of d5dbf6175 to ub-launcher3-masterTony Wickham2017-05-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: I solemnly swear I tested this conflict resolution. Change-Id: I2aefe84331c3236993bf23bd982d639b2ba2499e
| * | | | | | | | resolve merge conflicts of 02aced978 to ub-launcher3-dorval-polishTony Wickham2017-05-195-14/+13
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib44ce0130b9eb01c354f18326d7d3a1eeb2c5eb8
* | | | | | | | | Merge "Rounded caret" into ub-launcher3-dorval-polishPeter Schiller2017-05-181-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7056275771 Change-Id: Id219fce386182d1fb1150f2dcfcf1855af5180d4
| * | | | | | | | Merge "Rounded caret" into ub-launcher3-dorval-polishPeter Schiller2017-05-181-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rounded caretPeter Schiller2017-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3889fe61a29834c3c7e3829a990b481507589f68
* | | | | | | | | | Don't set system shortcut text to whiteTony Wickham2017-05-182-5/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 30e55d0f7c Change-Id: Iab1977c0d2599cb1131ea3a9fa62dd6c15e56e69
| * | | | | | | | | Don't set system shortcut text to whiteTony Wickham2017-05-182-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 38201638 Change-Id: Icacd63810306848ec1fb54e5dcc6021660ac5099
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4915614962 -s ours Change-Id: I624ec1f87bb86a1b134da30866dd2d533895f220
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-1789-228/+582
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I14925e787ac1adbf5aa2e89cebc6c5b3548c7fe4 Auto-generated-cl: translation import
* | | | | | | | | | Merge changes from topic 'am-f18a06ce-986c-4a0c-8890-fc89ddd13b36' into ↵TreeHugger Robot2017-05-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-master * changes: Import translations. DO NOT MERGE skipped: 2a7c820dac Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGE skipped: 2a7c820dacBill Yi2017-05-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I382b982ab7ac12332c35646178ae789b1a204f26
| | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-1789-228/+582
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e20d48d0f6eaedfa6d93fc7ed0b355c34e92a98 Auto-generated-cl: translation import
| | * | | | | | | | Merge "When building Launcher3 target, LauncherDumpProto class should not be ↵TreeHugger Robot2017-05-171-0/+4
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | proguarded b/36904684" into ub-launcher3-dorval
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into ub-launcher3-masterTreeHugger Robot2017-05-1889-228/+582
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-1789-228/+582
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b6795f9483c54daf9d0484bc370f056263979ac Auto-generated-cl: translation import
* | | | | | | | | | Make expanded system shortcuts clickable am: cd58d0d4e5Tony Wickham2017-05-181-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | Change-Id: If8148c3dc536a7c098f0d81a61afb006248e5baf