Bill Yi
081fbed940
Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval
...
am: 45febfec54 -s ours
Change-Id: I45c8936ad2900bddc3133ffa5f105ea496d2eefb
2017-05-19 19:36:55 +00:00
Tony Wickham
fda3107c8b
Merge "Make expanded system shortcuts clickable" into ub-launcher3-dorval
...
am: 440052ce5d
Change-Id: I5d53a468bb4aa3060e3e7e618bfdbdb537a5aadc
2017-05-19 19:36:38 +00:00
Sunny Goyal
0e947fbdbb
Making some methods accessible
...
Bug: 37616877
Change-Id: I22ed43d9a39d321757d7c2fde7754b95a44780e2
2017-05-19 12:22:31 -07:00
Tony Wickham
3720c69322
resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polish
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4cdfeebd09be58270c249429104d91dc9a31b49c
2017-05-19 12:17:02 -07:00
Hyunyoung Song
e2e5eab102
Merge "When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684" into ub-launcher3-dorval am: 904a38340c
...
am: 4de0ddc4f1
Change-Id: I93e24c7a2d6c87f4511dc22189cb109d19212dc9
2017-05-19 19:14:50 +00:00
Sunny Goyal
9c12744f36
Removing workspaceLoaded check from loadDeepShortcuts() am: 4869bf3f74
...
am: c6bfffb078
Change-Id: Ic9f92c01a8e02e7283e8395a994329c4cc311207
2017-05-19 19:14:33 +00:00
Tony Wickham
8aea3b185a
resolve merge conflicts of d5dbf6175 to ub-launcher3-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aefe84331c3236993bf23bd982d639b2ba2499e
2017-05-19 12:03:45 -07:00
Hyunyoung Song
4de0ddc4f1
Merge "When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684" into ub-launcher3-dorval
...
am: 904a38340c
Change-Id: I3cb282f6c78ff0c9a34e8f3ced25915fe3b96d7f
2017-05-19 18:02:19 +00:00
Sunny Goyal
c6bfffb078
Removing workspaceLoaded check from loadDeepShortcuts()
...
am: 4869bf3f74
Change-Id: I1516a214df024f5e9b9387671cfadd3697384ede
2017-05-19 18:02:00 +00:00
Tony Wickham
d5dbf61757
resolve merge conflicts of 02aced978 to ub-launcher3-dorval-polish
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib44ce0130b9eb01c354f18326d7d3a1eeb2c5eb8
2017-05-19 10:52:19 -07:00
Peter Schiller
ecb6ade23b
Merge "Rounded caret" into ub-launcher3-dorval-polish
...
am: 7056275771
Change-Id: Id219fce386182d1fb1150f2dcfcf1855af5180d4
2017-05-18 23:31:26 +00:00
Peter Schiller
7056275771
Merge "Rounded caret" into ub-launcher3-dorval-polish
2017-05-18 23:23:44 +00:00
Tony Wickham
95cb4e098d
Don't set system shortcut text to white
...
am: 30e55d0f7c
Change-Id: Iab1977c0d2599cb1131ea3a9fa62dd6c15e56e69
2017-05-18 22:50:53 +00:00
Tony Wickham
30e55d0f7c
Don't set system shortcut text to white
...
Bug: 38201638
Change-Id: Icacd63810306848ec1fb54e5dcc6021660ac5099
2017-05-18 15:31:19 -07:00
Peter Schiller
b01046f9e7
Rounded caret
...
Change-Id: I3889fe61a29834c3c7e3829a990b481507589f68
2017-05-18 14:12:47 -07:00
Bill Yi
0f571d40c1
Import translations. DO NOT MERGE
...
am: 4915614962 -s ours
Change-Id: I624ec1f87bb86a1b134da30866dd2d533895f220
2017-05-18 18:43:04 +00:00
TreeHugger Robot
45febfec54
Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval
2017-05-18 18:40:39 +00:00
TreeHugger Robot
6285a5e283
Merge changes from topic 'am-f18a06ce-986c-4a0c-8890-fc89ddd13b36' into ub-launcher3-master
...
* changes:
Import translations. DO NOT MERGE skipped: 2a7c820dac
Import translations. DO NOT MERGE
2017-05-18 18:40:39 +00:00
TreeHugger Robot
abd32f986d
Merge "Import translations. DO NOT MERGE" into ub-launcher3-master
2017-05-18 18:38:41 +00:00
TreeHugger Robot
440052ce5d
Merge "Make expanded system shortcuts clickable" into ub-launcher3-dorval
2017-05-18 18:34:04 +00:00
Tony Wickham
79222e9c3f
Make expanded system shortcuts clickable am: cd58d0d4e5
...
Change-Id: If8148c3dc536a7c098f0d81a61afb006248e5baf
2017-05-18 18:17:15 +00:00
Tony Wickham
cd58d0d4e5
Make expanded system shortcuts clickable
...
The textview on top was consuming the clicks, so we set it to
not be focusable (clicks are handled by the parent).
This regression was caused by a TextView bug introduced in
ag/2247666, which set clickable=true if focusable=true.
Bug: 38385679
Change-Id: I0a946073919dabcd19b47cd7df2a1fcac6946cd5
2017-05-18 11:16:58 -07:00
Tony Wickham
8af16760dc
Merge "Update accessibility for popup" into ub-launcher3-dorval
2017-05-18 01:06:46 +00:00
Tony Wickham
d1c496e5fe
Merge changes from topic 'am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de' into ub-launcher3-master
...
* changes:
Merge commit '18c4aa458ea5c9ee5513fa756da4f5492bb7c5b8' into am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de
Update accessibility for popup
Update accessibility for popup
2017-05-18 01:06:46 +00:00
Bill Yi
0c098dc5a0
Import translations. DO NOT MERGE
...
Change-Id: I5b6795f9483c54daf9d0484bc370f056263979ac
Auto-generated-cl: translation import
2017-05-17 17:10:05 -07:00
Bill Yi
4915614962
Import translations. DO NOT MERGE
...
Change-Id: I14925e787ac1adbf5aa2e89cebc6c5b3548c7fe4
Auto-generated-cl: translation import
2017-05-17 17:08:22 -07:00
Bill Yi
ac9b256366
Import translations. DO NOT MERGE skipped: 2a7c820dac
...
Change-Id: I382b982ab7ac12332c35646178ae789b1a204f26
2017-05-18 00:06:11 +00:00
Bill Yi
2a7c820dac
Import translations. DO NOT MERGE
...
Change-Id: I0e20d48d0f6eaedfa6d93fc7ed0b355c34e92a98
Auto-generated-cl: translation import
2017-05-17 17:05:55 -07:00
Sunny Goyal
233fbd7059
Adding an option to change the shadow size
...
am: 8b6ac00a1b
Change-Id: I6ebafb3b81f486adeb510bc021638dd266ca1234
2017-05-17 21:10:34 +00:00
TreeHugger Robot
904a38340c
Merge "When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684" into ub-launcher3-dorval
2017-05-17 21:01:18 +00:00
TreeHugger Robot
3148d486e4
Merge changes from topic 'am-ab6fc536-0646-4c6c-ae5a-3c2749ab079f' into ub-launcher3-master
...
* changes:
When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684 am: 2d4d1c532d
When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684
2017-05-17 21:01:18 +00:00
Sunny Goyal
8b6ac00a1b
Adding an option to change the shadow size
...
Change-Id: I8ec810c5cf06852771247af5f1d717f41079c4f5
2017-05-17 13:43:45 -07:00
Sunny Goyal
1df3cac94c
Aligning the search box with bottom of hotseat icons
...
am: 0dc1db4fee
Change-Id: I8d464cb70db99e16d6532188099229ba0a4f701a
2017-05-17 20:40:29 +00:00
Hyunyoung Song
508c8f3ac8
When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684 am: 2d4d1c532d
...
Change-Id: I50b2c2e0502ca70fe0a42edb2eb2fb7ffefd5d9d
2017-05-17 20:19:41 +00:00
Hyunyoung Song
2d4d1c532d
When building Launcher3 target, LauncherDumpProto class should not be proguarded
...
b/36904684
Change-Id: I0fd0e1c63d54d83db428a04067a37f582e4d23f1
2017-05-17 13:18:54 -07:00
Sunny Goyal
7ff0295f7a
Removing workspaceLoaded check from loadDeepShortcuts() am: 4869bf3f74
...
Change-Id: Ie438d19db6a1577eff59009f214d1f406b97bfd8
2017-05-17 19:07:53 +00:00
Sunny Goyal
4869bf3f74
Removing workspaceLoaded check from loadDeepShortcuts()
...
loadDeepShortcuts() is called after loadWorkspace() which already
clears the shortcutMap. So if loader runs twice, during the second run,
workspaceLoaded is true, but the shortcutMap had already been cleared
in loadWorkspace().
Bug: 38384071
Change-Id: I40f0faf88376617e56819aef02620488e528dfb2
2017-05-17 12:07:39 -07:00
Sunny Goyal
0dc1db4fee
Aligning the search box with bottom of hotseat icons
...
Bug: 37616877
Change-Id: I153e754db8e6c96b47ab644e19ce110f56bf852e
2017-05-17 11:36:31 -07:00
Tony Wickham
c2c27e6766
Merge "Add setting to turn off icon badging" into ub-launcher3-dorval am: d315d07aee
...
am: 9863ea5dc7
Change-Id: I9b553e7d76c084ec75ad6e964a835665b14a3316
2017-05-16 23:40:21 +00:00
Tony Wickham
9863ea5dc7
Merge "Add setting to turn off icon badging" into ub-launcher3-dorval
...
am: d315d07aee
Change-Id: Id23914cbee040f3916257e02a9eb6b3f5a821b83
2017-05-16 23:38:22 +00:00
Tony Wickham
02aced9782
Merge "Use a single color for all icon badges." into ub-launcher3-dorval
2017-05-16 23:34:52 +00:00
Tony Wickham
1cf5357c9b
Merge changes from topic 'badge-color' into ub-launcher3-master
...
* changes:
Fix merge conflicts
Use a single color for all icon badges.
2017-05-16 23:34:52 +00:00
Tony Wickham
d315d07aee
Merge "Add setting to turn off icon badging" into ub-launcher3-dorval
2017-05-16 23:33:59 +00:00
Tony Wickham
7cee9e3bba
Merge changes from topic 'badge-setting' into ub-launcher3-master
...
* changes:
Add setting to turn off icon badging am: 2ab8482809
Add setting to turn off icon badging
2017-05-16 23:33:59 +00:00
Mario Bertschler
3c3e6cb58f
Design adjustments for transition from workspace to All apps.
...
am: 8acf8b506d
Change-Id: I68c0eaac758ac66548ac38a60bfb07642cfec34b
2017-05-16 23:29:48 +00:00
Mario Bertschler
8acf8b506d
Design adjustments for transition from workspace to
...
All apps.
Change-Id: I0aeb8da7f0eebdf677ca7bda06fb538f08a6ee51
2017-05-16 16:13:11 -07:00
Tony
03ab95721f
Fix merge conflicts
...
Change-Id: If2cabd5558421b8d325faf4f6d7d21b0beccaace
2017-05-16 15:28:56 -07:00
Tony Wickham
4d03da2325
Add setting to turn off icon badging am: 2ab8482809
...
Change-Id: I50da31d1a44d85a7d5cb91621186fb62c645cfd0
2017-05-16 21:09:03 +00:00
Tony Wickham
2ab8482809
Add setting to turn off icon badging
...
Redirects to system Notifications setting page.
Bug: 36815147
Change-Id: I5ee542f94ed51a73a57df3a726384944ff3ee71d
2017-05-16 14:08:42 -07:00
Mario Bertschler
ee2ec7cb78
Merge "Minor polishment on app discovery UI." into ub-launcher3-dorval am: 8ffddbb7c2
...
am: 7f91393c55
Change-Id: I4b2141542e90fc7773feeb4e78dbb1b3f793a4ea
2017-05-16 20:16:43 +00:00