* commit '102c95dbff6d166292903e40dad7b364e59ef1c9':
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* commit 'cc619e2eca624d293e0e7f65f82305a5d925dbf7':
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* commit '6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7':
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* commit 'e612775922ec9f8cc4e5cb976bc62b3312a3de0e':
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* commit '13ef17a37e683b8ad5800e9f542b411180fbec2f': (500 commits)
Adding minSpanX and minSpanY for all the launcher widgets
[DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
Query the title and icon for app using correct user handle.
Fix issue where corp app widget doesn't show correctly on drop targets.
[DO NOT MERGE] fixing build break
Fixing AppWidgetInfo not initialized with proper user
[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
Fix issue with UiThreadReveal on L devices
Import translations. DO NOT MERGE
Using highres icons for backup
Import translations. DO NOT MERGE
Widget row should not be cut off on the right, when there is an indent
Fixing shortcuts not getting migrated to app icons
Fixing regression in calculating workspace padding.
Hide spammy WidgetModel log behind a DEBUG flag
Import translations. DO NOT MERGE
Animation should start and finish on widgets button when opening/closing widget tray.
Making long-press of AllApps to jump directly to search.
Computing the visible cell layout area without using the current scroll
Fixing overscroll not drawn in rtl
...
* commit '0c0d54637af7109ae22e21a117dba3efdaded4b5': (500 commits)
Adding minSpanX and minSpanY for all the launcher widgets
[DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
Query the title and icon for app using correct user handle.
Fix issue where corp app widget doesn't show correctly on drop targets.
[DO NOT MERGE] fixing build break
Fixing AppWidgetInfo not initialized with proper user
[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
Fix issue with UiThreadReveal on L devices
Import translations. DO NOT MERGE
Using highres icons for backup
Import translations. DO NOT MERGE
Widget row should not be cut off on the right, when there is an indent
Fixing shortcuts not getting migrated to app icons
Fixing regression in calculating workspace padding.
Hide spammy WidgetModel log behind a DEBUG flag
Import translations. DO NOT MERGE
Animation should start and finish on widgets button when opening/closing widget tray.
Making long-press of AllApps to jump directly to search.
Computing the visible cell layout area without using the current scroll
Fixing overscroll not drawn in rtl
...
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
> 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
Hyunyoung Song
Sunny Goyal
Adam Cohen
Geoff Mendal