Hyunyoung Song
9486780029
am 680c92fe: resolved conflicts for merge of 13ef17a3 to cw-e-dev b/22609402 Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
...
* commit '680c92febe88260b74f101838a9734b8e10a704c':
2015-07-28 19:38:17 +00:00
Hyunyoung Song
0c0d54637a
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
...
b/22609402
Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
2015-07-23 21:24:37 -07:00
Hyunyoung Song
680c92febe
resolved conflicts for merge of 13ef17a3 to cw-e-dev
...
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
2015-07-23 17:08:47 -07:00
Hyunyoung Song
13ef17a37e
merged ub-launcher3-burnaby, and resolved conflicts
...
Note1: Verified that following succeeds. $ make -j 32 dist checkbuild
Note2: Verified that the git history of burnaby is (998 commit) is pulled
into mnc-dev packages/apps/Launcher3 git project using gitk.
b/22609402
Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae
2015-07-20 15:37:27 -07:00
Sunny Goyal
e3fe3f89ee
am 249a510a: (-s ours) [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
...
* commit '249a510ab318db461ce1ac86baca01021fe41a2c':
[DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
2015-07-17 19:36:00 +00:00
Sunny Goyal
b04136b471
Merge "Adding minSpanX and minSpanY for all the launcher widgets" into ub-launcher3-burnaby
2015-07-17 18:56:38 +00:00
Sunny Goyal
3a30cfeb7c
Adding minSpanX and minSpanY for all the launcher widgets
...
Bug: 22353460
Change-Id: Id4450dee42a83e4603dcd56e1c4dec2b0e405858
2015-07-17 11:10:05 -07:00
Sunny Goyal
249a510ab3
[DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
...
Bug: 22353460
Change-Id: Id4450dee42a83e4603dcd56e1c4dec2b0e405858
2015-07-16 19:35:36 -07:00
Hyunyoung Song
f63dda5e15
Query the title and icon for app using correct user handle.
...
> Note: when there are corp and regular user profile widget providers,
it is guaranteed that regular user profile widget provider is always
queried first. Thsi is guaranteed because inside AppWidgetManagerCompat.getProviders(),
regular user always takes prescedence when iterating thru different providers
associated to different users.
Change-Id: I5e38e1fb30925ccba7e1e2925fd3e77c44a14901
2015-07-16 17:24:30 -07:00
Hyunyoung Song
7dc9a0f7d7
Merge "Fix issue where corp app widget doesn't show correctly on drop targets." into ub-launcher3-burnaby
2015-07-16 23:37:36 +00:00
Hyunyoung Song
ffd0ab4da1
Fix issue where corp app widget doesn't show correctly on drop targets.
...
b/22535234
Change-Id: I6e57c7728704ad0f99df25257211243a23d26acd
2015-07-16 16:36:59 -07:00
Sunny Goyal
36db85679d
Merge "Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-burnaby
2015-07-16 01:13:01 +00:00
Sunny Goyal
c606871502
am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte
...
* commit '3fec14bedc03d77aa7a066a8053c6068dddda192':
[DO NOT MERGE] fixing build break
2015-07-16 01:10:17 +00:00
Sunny Goyal
be217bf044
am e48e570a: (-s ours) Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-almonte
...
* commit 'e48e570a82293d34e955b966c7821770600ec7bf':
[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
2015-07-16 01:03:06 +00:00
Sunny Goyal
3fec14bedc
Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte
2015-07-16 01:03:00 +00:00
Sunny Goyal
1e23e4d24d
[DO NOT MERGE] fixing build break
...
Change-Id: Ief14e03874626d4f6fdf403d98950d9d64b66160
2015-07-15 18:02:14 -07:00
Sunny Goyal
e48e570a82
Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-almonte
2015-07-16 00:50:18 +00:00
Sunny Goyal
ab7a4fe206
Fixing AppWidgetInfo not initialized with proper user
...
Bug: 21673750
Change-Id: I1e03c3cb10a87e394e963cc2001c9c1c293eb2ca
2015-07-15 17:39:33 -07:00
Adam Cohen
84a62861d6
Merge "Fix issue with UiThreadReveal on L devices" into ub-launcher3-burnaby
2015-07-16 00:38:11 +00:00
Sunny Goyal
7fb55d25e3
[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
...
Bug: 21673750
Change-Id: I1e03c3cb10a87e394e963cc2001c9c1c293eb2ca
2015-07-15 17:37:24 -07:00
Adam Cohen
54e362121f
Fix issue with UiThreadReveal on L devices
...
issue 22507784
Change-Id: If75292b21a1b572903099ab0682d5c7f69a960f4
2015-07-15 17:35:56 -07:00
Geoff Mendal
ad4d162835
am eb01b967: (-s ours) Import translations. DO NOT MERGE
...
* commit 'eb01b967460d0d8287042e5f6dd16578f3f59eb6':
Import translations. DO NOT MERGE
2015-07-15 21:37:53 +00:00
Geoff Mendal
eb01b96746
Import translations. DO NOT MERGE
...
Change-Id: I025eedc9fa35a6ba583f8d3e215dd066ddb634b3
Auto-generated-cl: translation import
2015-07-15 13:07:24 -07:00
Sunny Goyal
0c13a34fd1
Merge "Using highres icons for backup" into ub-launcher3-burnaby
2015-07-15 17:55:11 +00:00
Geoff Mendal
cf51139c6e
am 494d2237: (-s ours) am a83129f0: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE
...
* commit '494d2237b8d7b892902604c18098127e77372509':
Import translations. DO NOT MERGE
2015-07-15 17:41:26 +00:00
Geoff Mendal
494d2237b8
am a83129f0: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a83129f0bc778fd1ccd799bd8cfa40270f632e1d':
Import translations. DO NOT MERGE
2015-07-15 17:27:06 +00:00
Sunny Goyal
09d70195d7
Using highres icons for backup
...
Bug: 22410445
Change-Id: I0fbc2d1217127556af806f12dbb5960712627ab7
2015-07-15 10:18:09 -07:00
Geoff Mendal
a83129f0bc
am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e5ec4ac409eb3d3169bb9350dfda51ae7e08291e':
Import translations. DO NOT MERGE
2015-07-15 17:13:27 +00:00
Geoff Mendal
e5ec4ac409
Import translations. DO NOT MERGE
...
Change-Id: Ibaeb926647e035d8c46ca07c7a2e7d535050fb87
Auto-generated-cl: translation import
2015-07-15 09:54:49 -07:00
Geoff Mendal
237e2e0c9f
Import translations. DO NOT MERGE
...
Change-Id: I26a10cf2320602abc00b38dfafc228e22fa20f1a
Auto-generated-cl: translation import
2015-07-15 05:20:13 -07:00
Hyunyoung Song
321dea1346
Merge "Widget row should not be cut off on the right, when there is an indent" into ub-launcher3-burnaby
2015-07-14 23:58:14 +00:00
Hyunyoung Song
6fdc2035ea
Widget row should not be cut off on the right, when there is an indent
...
b/22483452
Change-Id: I9d1cd8b71f4b6a4f75af420e9f54b73e9ae7527c
2015-07-14 16:52:35 -07:00
Sunny Goyal
2a1be7a616
Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-burnaby
2015-07-14 17:48:30 +00:00
Sunny Goyal
c22841bfd1
Fixing shortcuts not getting migrated to app icons
...
Bug: 22410445
Change-Id: I939c59270529daf51638aa30b30763c18a2ce6a5
2015-07-13 20:15:37 -07:00
Winson Chung
af2637376f
Merge "Fixing regression in calculating workspace padding." into ub-launcher3-burnaby
2015-07-13 23:24:02 +00:00
Winson Chung
4f3bfadbf4
Fixing regression in calculating workspace padding.
...
Bug: 22340087
Change-Id: I28d599fbb8f136b8b5aa4aeffaa0fba5661ab73c
2015-07-13 11:15:06 -07:00
Hyunyoung Song
cbab1cb44f
Merge "Hide spammy WidgetModel log behind a DEBUG flag" into ub-launcher3-burnaby
2015-07-13 17:36:05 +00:00
Hyunyoung Song
f56513f6ba
Hide spammy WidgetModel log behind a DEBUG flag
...
Change-Id: I0119855655516d9fdc114334a974b8766aabf674
2015-07-13 10:26:22 -07:00
Geoff Mendal
05ffc7265b
am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE
...
* commit '913cd0086cec15e05b2b64f9a3e14448b0c53df2':
Import translations. DO NOT MERGE
2015-07-13 15:32:06 +00:00
Geoff Mendal
913cd0086c
am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fd7a7dc8482de00ab1a34fa23ec8d8e8b4985fe4':
Import translations. DO NOT MERGE
2015-07-13 15:11:29 +00:00
Geoff Mendal
fd7a7dc848
Import translations. DO NOT MERGE
...
Change-Id: I7eaa0e72278a82d50a0fb1cd628109af61b88acf
Auto-generated-cl: translation import
2015-07-11 17:46:09 -05:00
Geoff Mendal
633ce45b05
Import translations. DO NOT MERGE
...
Change-Id: Ie264c6de4d3b8a6c54ee093512aa1032a2d09d65
Auto-generated-cl: translation import
2015-07-11 06:18:55 -07:00
Hyunyoung Song
98ff38aa48
Animation should start and finish on widgets button when opening/closing widget tray.
...
b/21301759
Change-Id: Ib0b9132d8709426598d95fc9f60d37752e05b711
2015-07-10 17:50:13 -07:00
Winson Chung
76648c58d5
Making long-press of AllApps to jump directly to search.
...
Bug: 22210146
Change-Id: Iacf28416d6e31233a68e3b41576a8860b4b72b88
2015-07-10 16:08:56 -07:00
Sunny Goyal
4a0df75516
Merge "Computing the visible cell layout area without using the current scroll" into ub-launcher3-burnaby
2015-07-09 17:14:49 +00:00
Sunny Goyal
41d8417678
Computing the visible cell layout area without using the current scroll
...
Bug: 22358433
Change-Id: Ib79d02156b6bfab831fa659637f6113a7f555ba7
2015-07-09 10:13:36 -07:00
Winson Chung
ceb21570f8
Merge "Adding bounds checking when updating container bounds." into ub-launcher3-burnaby
2015-07-09 17:12:48 +00:00
Sunny Goyal
cb037eee8c
Fixing overscroll not drawn in rtl
...
> Using the currect right page index in rtl
> Updating current scroll after max scroll has been calculated. This prevens an extra overscroll when the layout happens for the first time.
Bug: 22358804
Change-Id: If07132701936e06f727211122a3b3e6f8426c07b
2015-07-08 16:44:37 -07:00
Winson Chung
73f0b9b015
Adding bounds checking when updating container bounds.
...
- Only update the container bounds from their defaults if
the search bar bounds are valid
- Adding logging to see if we can track down cases where we
are getting bad bounds
Bug: 22333435
Change-Id: If15b6e228226e82e0fb9c7ba0f5b8a7a5f1d2e68
2015-07-08 16:21:00 -07:00
Geoff Mendal
987922d81e
am 9e218eaf: (-s ours) Import translations. DO NOT MERGE
...
* commit '9e218eaf2398e72619ab8dcd596ca99bfc85746b':
Import translations. DO NOT MERGE
2015-07-08 19:12:29 +00:00