summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 13ef17a3 to cw-e-devHyunyoung Song2015-07-23630-21573/+23687
|\ | | | | | | | | b/22609402 Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
| * merged ub-launcher3-burnaby, and resolved conflictsHyunyoung Song2015-07-20630-21560/+23674
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * am 249a510a: (-s ours) [DO NOT MERGE] Adding minSpanX and minSpanY for all ↵Sunny Goyal2015-07-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | the launcher widgets * commit '249a510ab318db461ce1ac86baca01021fe41a2c': [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
| | | * [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgetsSunny Goyal2015-07-163-10/+17
| | | | | | | | | | | | | | | | | | | | Bug: 22353460 Change-Id: Id4450dee42a83e4603dcd56e1c4dec2b0e405858
| | * | Merge "Adding minSpanX and minSpanY for all the launcher widgets" into ↵Sunny Goyal2015-07-174-14/+34
| | |\ \ | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | Adding minSpanX and minSpanY for all the launcher widgetsSunny Goyal2015-07-174-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22353460 Change-Id: Id4450dee42a83e4603dcd56e1c4dec2b0e405858
| | * | | Query the title and icon for app using correct user handle.Hyunyoung Song2015-07-161-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > 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
| | * | | Merge "Fix issue where corp app widget doesn't show correctly on drop ↵Hyunyoung Song2015-07-161-0/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | targets." into ub-launcher3-burnaby
| | | * | Fix issue where corp app widget doesn't show correctly on drop targets.Hyunyoung Song2015-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/22535234 Change-Id: I6e57c7728704ad0f99df25257211243a23d26acd
| | * | | Merge "Fixing AppWidgetInfo not initialized with proper user" into ↵Sunny Goyal2015-07-161-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | Fixing AppWidgetInfo not initialized with proper userSunny Goyal2015-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21673750 Change-Id: I1e03c3cb10a87e394e963cc2001c9c1c293eb2ca
| | * | | | am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ↵Sunny Goyal2015-07-160-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-almonte * commit '3fec14bedc03d77aa7a066a8053c6068dddda192': [DO NOT MERGE] fixing build break
| | | * | | Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonteSunny Goyal2015-07-161-1/+1
| | | |\ \ \
| | | | * | | [DO NOT MERGE] fixing build breakSunny Goyal2015-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief14e03874626d4f6fdf403d98950d9d64b66160
| | * | | | | am e48e570a: (-s ours) Merge "[Do NOT MERGE] Fixing AppWidgetInfo not ↵Sunny Goyal2015-07-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized with proper user" into ub-launcher3-almonte * commit 'e48e570a82293d34e955b966c7821770600ec7bf': [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
| | | * | | | Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" ↵Sunny Goyal2015-07-161-1/+8
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | into ub-launcher3-almonte
| | | | * | | [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper userSunny Goyal2015-07-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21673750 Change-Id: I1e03c3cb10a87e394e963cc2001c9c1c293eb2ca
| | * | | | | Merge "Fix issue with UiThreadReveal on L devices" into ub-launcher3-burnabyAdam Cohen2015-07-161-4/+2
| | |\ \ \ \ \
| | | * | | | | Fix issue with UiThreadReveal on L devicesAdam Cohen2015-07-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue 22507784 Change-Id: If75292b21a1b572903099ab0682d5c7f69a960f4
| | * | | | | | am eb01b967: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | |_|_|/ / | | |/| | | | * commit 'eb01b967460d0d8287042e5f6dd16578f3f59eb6': Import translations. DO NOT MERGE
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-153-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I025eedc9fa35a6ba583f8d3e215dd066ddb634b3 Auto-generated-cl: translation import
| | * | | | | Merge "Using highres icons for backup" into ub-launcher3-burnabySunny Goyal2015-07-151-1/+1
| | |\ \ \ \ \
| | | * | | | | Using highres icons for backupSunny Goyal2015-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22410445 Change-Id: I0fbc2d1217127556af806f12dbb5960712627ab7
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-152-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26a10cf2320602abc00b38dfafc228e22fa20f1a Auto-generated-cl: translation import
| | * | | | | | Merge "Widget row should not be cut off on the right, when there is an ↵Hyunyoung Song2015-07-141-4/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | indent" into ub-launcher3-burnaby
| | | * | | | | Widget row should not be cut off on the right, when there is an indentHyunyoung Song2015-07-141-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/22483452 Change-Id: I9d1cd8b71f4b6a4f75af420e9f54b73e9ae7527c
| | * | | | | | Merge "Fixing shortcuts not getting migrated to app icons" into ↵Sunny Goyal2015-07-142-4/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | | | | Fixing shortcuts not getting migrated to app iconsSunny Goyal2015-07-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22410445 Change-Id: I939c59270529daf51638aa30b30763c18a2ce6a5
| | * | | | | | | Merge "Fixing regression in calculating workspace padding." into ↵Winson Chung2015-07-132-8/+15
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | | | | Fixing regression in calculating workspace padding.Winson Chung2015-07-132-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22340087 Change-Id: I28d599fbb8f136b8b5aa4aeffaa0fba5661ab73c
| | * | | | | | | Merge "Hide spammy WidgetModel log behind a DEBUG flag" into ↵Hyunyoung Song2015-07-131-1/+3
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | / | | | |_|_|_|_|/ | | |/| | | | | ub-launcher3-burnaby
| | | * | | | | Hide spammy WidgetModel log behind a DEBUG flagHyunyoung Song2015-07-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0119855655516d9fdc114334a974b8766aabf674
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-111-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie264c6de4d3b8a6c54ee093512aa1032a2d09d65 Auto-generated-cl: translation import
| | * | | / / Animation should start and finish on widgets button when opening/closing ↵Hyunyoung Song2015-07-102-95/+45
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | widget tray. b/21301759 Change-Id: Ib0b9132d8709426598d95fc9f60d37752e05b711
| | * | | | Making long-press of AllApps to jump directly to search.Winson Chung2015-07-104-20/+52
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 22210146 Change-Id: Iacf28416d6e31233a68e3b41576a8860b4b72b88
| | * | | Merge "Computing the visible cell layout area without using the current ↵Sunny Goyal2015-07-092-45/+29
| | |\ \ \ | | | | | | | | | | | | | | | | | | scroll" into ub-launcher3-burnaby
| | | * | | Computing the visible cell layout area without using the current scrollSunny Goyal2015-07-092-45/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22358433 Change-Id: Ib79d02156b6bfab831fa659637f6113a7f555ba7
| | * | | | Merge "Adding bounds checking when updating container bounds." into ↵Winson Chung2015-07-091-10/+26
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | ub-launcher3-burnaby
| | | * | | Adding bounds checking when updating container bounds.Winson Chung2015-07-081-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * | | | Fixing overscroll not drawn in rtlSunny Goyal2015-07-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > 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
| | * | | | am 9e218eaf: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '9e218eaf2398e72619ab8dcd596ca99bfc85746b': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-088-0/+640
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6f8aab0ef73f981d6a61581afc97b7373ead696 Auto-generated-cl: translation import
| | * | | | Merge "Import translations. DO NOT MERGE" into ub-launcher3-burnabyGeoff Mendal2015-07-088-0/+548
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-088-0/+548
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I6d088f3a7797d75df4e1faf21b3809a891618449 Auto-generated-cl: translation import
| | * | | | am 4356e281: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | * commit '4356e281037c51e8d0a92e8e93c11e5ee58e1dd2': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-0816-31/+191
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I320b14c25007f49de2236722bf8239ab8c77e00d Auto-generated-cl: translation import
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-083-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32cb7994d836d2ea00acab42fa11f31b33dab3d9 Auto-generated-cl: translation import
| | * | | Merge "Adding custom slide up activity transition for L MR1" into ↵Adam Cohen2015-07-083-0/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | Adding custom slide up activity transition for L MR1Adam Cohen2015-07-073-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue 21402755 Change-Id: Id2542c0a3c38bd71aa407a3b0fe00fdee24e2f69
| | * | | | Merge "Updating makefile to use the current SDK" into ub-launcher3-burnabySunny Goyal2015-07-071-14/+4
| | |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 14:44:32 +0000