Commit Graph

10313 Commits

Author SHA1 Message Date
Sunny Goyal 5d20d232ed am e3fe3f89: (-s ours) am 249a510a: (-s ours) [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
* commit 'e3fe3f89ee956e8d7995c569948cb70765ec19b8':
  [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
2015-07-17 19:43:17 +00: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 05be6b7649 am b04136b4: Merge "Adding minSpanX and minSpanY for all the launcher widgets" into ub-launcher3-burnaby
* commit 'b04136b4714a0d9afddab6a70045f4f4f7fa1ee4':
  Adding minSpanX and minSpanY for all the launcher widgets
2015-07-17 19:06:46 +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 11bebbc463 am f63dda5e: Query the title and icon for app using correct user handle.
* commit 'f63dda5e153febf0b5163ac41d927129ec822314':
  Query the title and icon for app using correct user handle.
2015-07-17 00:39:17 +00: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 a1ce66dfb7 am 7dc9a0f7: Merge "Fix issue where corp app widget doesn\'t show correctly on drop targets." into ub-launcher3-burnaby
* commit '7dc9a0f7d7e138cb9e685609777021b74e8dd67b':
  Fix issue where corp app widget doesn't show correctly on drop targets.
2015-07-16 23:49:15 +00: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 8239daded4 Merge "Fixing drag outline positions for folder over hotseat" into ub-launcher3-master 2015-07-16 22:09:32 +00:00
Sunny Goyal 92bce43164 Fixing drag outline positions for folder over hotseat
Change-Id: Ia2508307554089205fd678987454e81cb811a59b
2015-07-16 15:08:41 -07:00
Sunny Goyal 14031ebb81 am 36db8567: Merge "Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-burnaby
* commit '36db85679d492888f03654fa04f6c291e74168e7':
  Fixing AppWidgetInfo not initialized with proper user
2015-07-16 01:18:27 +00:00
Sunny Goyal d560bb1b5f am c6068715: (-s ours) am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte
* commit 'c606871502e9c6e69c00e3f79d2c2871d7a26dec':
  [DO NOT MERGE] fixing build break
2015-07-16 01:18:26 +00: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 5db8c0a5ac am be217bf0: (-s ours) am e48e570a: (-s ours) Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-almonte
* commit 'be217bf044892d49e427f000606308860a755585':
  [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
2015-07-16 01:10:14 +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
Adam Cohen ec66a6d0f7 am 84a62861: Merge "Fix issue with UiThreadReveal on L devices" into ub-launcher3-burnaby
* commit '84a62861d6ba91f3b0822d6da0c1c7eedf9b3f0e':
  Fix issue with UiThreadReveal on L devices
2015-07-16 00:53:56 +00: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 1990e06256 am ad4d1628: (-s ours) am eb01b967: (-s ours) Import translations. DO NOT MERGE
* commit 'ad4d162835f97eadaf45b095253847da90804265':
  Import translations. DO NOT MERGE
2015-07-15 21:44:29 +00: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 b7443004d8 am 0c13a34f: Merge "Using highres icons for backup" into ub-launcher3-burnaby
* commit '0c13a34fd1f32a8cb8c5cec06553e3741731c756':
  Using highres icons for backup
2015-07-15 18:03:12 +00:00
Sunny Goyal 0c13a34fd1 Merge "Using highres icons for backup" into ub-launcher3-burnaby 2015-07-15 17:55:11 +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 0fc3be50d6 am 237e2e0c: (-s ours) Import translations. DO NOT MERGE
* commit '237e2e0c9f9f2f8cfa56bf30f8169f9d682f4618':
  Import translations. DO NOT MERGE
2015-07-15 13:02:48 +00:00
Geoff Mendal 0e1b6e33f0 Import translations. DO NOT MERGE
Change-Id: I36fb90b2b6a3bd1ef28674890eac24ea6033d9c3
Auto-generated-cl: translation import
2015-07-15 05:21:02 -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 eaa3750a01 am 321dea13: Merge "Widget row should not be cut off on the right, when there is an indent" into ub-launcher3-burnaby
* commit '321dea1346ba6e0e49a0cfc49b9303f3d7cfe303':
  Widget row should not be cut off on the right, when there is an indent
2015-07-15 00:09:38 +00: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 2f824acaab am 2a1be7a6: Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-burnaby
* commit '2a1be7a6165b49d21396bcb228a468bc79dd4d3e':
  Fixing shortcuts not getting migrated to app icons
2015-07-14 17:56:28 +00: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 4988ae8cda am af263737: Merge "Fixing regression in calculating workspace padding." into ub-launcher3-burnaby
* commit 'af2637376f5fb37d1dfa598a8c95a623367501ce':
  Fixing regression in calculating workspace padding.
2015-07-13 23:38:36 +00:00
Winson Chung af2637376f Merge "Fixing regression in calculating workspace padding." into ub-launcher3-burnaby 2015-07-13 23:24:02 +00:00
Hyunyoung Song 3155e34856 am cbab1cb4: Merge "Hide spammy WidgetModel log behind a DEBUG flag" into ub-launcher3-burnaby
* commit 'cbab1cb44f4fca4ea80ec2aeb63b55b9ea5d9e2e':
  Hide spammy WidgetModel log behind a DEBUG flag
2015-07-13 22:01:01 +00:00
Geoff Mendal 2298a94e11 am 633ce45b: (-s ours) Import translations. DO NOT MERGE
* commit '633ce45b0538cc2a941045be85ad742187a78c41':
  Import translations. DO NOT MERGE
2015-07-13 22:01:00 +00:00
Hyunyoung Song b4a367459a resolved conflicts for merge of 98ff38aa to ub-launcher3-master
Change-Id: Ie43d7215e604758936c558b79d191f1b26bb31f8
2015-07-13 14:23:39 -07: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