summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-10-0777-235/+239
| | | | | Change-Id: Ifd0c7cf9752ab62bb006b5e09abcceed538d196a Auto-generated-cl: translation import
* Removing some unused resourcesSunny Goyal2015-10-0514-150/+8
| | | | Change-Id: I6aa8a2d7eb4599ed2351c54fe0885839b5ba4521
* Merge "Adding some information in bug reports" into ub-launcher3-masterSunny Goyal2015-10-054-152/+61
|\
| * Adding some information in bug reportsSunny Goyal2015-10-014-152/+61
| | | | | | | | | | | | | | | | > Dumping workspace items > Dumping loader logs for crashes and data deletion > Removing unnecessary log dumps Change-Id: Ia320988c2e3665e4d605d6e88bca77738e749273
* | Merge "Added 'Cancel' drop target from all apps and widget picker." into ↵Tony Wickham2015-10-0512-30/+46
|\ \ | | | | | | | | | ub-launcher3-master
| * | Added 'Cancel' drop target from all apps and widget picker.Tony Wickham2015-10-0512-30/+46
| |/ | | | | | | | | | | | | | | | | | | - Reuse DeleteDropTarget since it's the same effect, but with "Cancel" instead of "Remove" if supportsDeleteDropTarget() returns false. - Rename related strings (but not their values) Bug: 24104015 Bug: 24099531 Change-Id: Ia9fbcaa17bb17f7aa31df1f830298da01544c178
* / Import translations. DO NOT MERGEGeoff Mendal2015-10-0577-13/+169
|/ | | | | Change-Id: I0113ddc9fa5b88c64999f13f720f7215f7f5f6f3 Auto-generated-cl: translation import
* am 0e32c14a: Merge "Fixing regression in search bar animation." into ↵Winson Chung2015-10-011-5/+5
|\ | | | | | | | | | | | | ub-launcher3-burnaby-polish * commit '0e32c14ada3fae610ece912dcfd426a4a397d9ca': Fixing regression in search bar animation.
| * Merge "Fixing regression in search bar animation." into ↵Winson Chung2015-10-011-5/+5
| |\ | | | | | | | | | ub-launcher3-burnaby-polish
| | * Fixing regression in search bar animation.Winson2015-10-011-5/+5
| | | | | | | | | | | | | | | | | | | | | - The other case should fall through to the animation even when there is no search bar overlay. Change-Id: Id91bea78b56934cc1c3379777068adc100f11dba
* | | am eaaed098: Merge "Adding progress information for preload icons in content ↵Sunny Goyal2015-10-012-0/+11
|\| | | | | | | | | | | | | | | | | | | | description" into ub-launcher3-burnaby-polish * commit 'eaaed098a633eb5a5759778d5b015e11373a5e3d': Adding progress information for preload icons in content description
| * | Merge "Adding progress information for preload icons in content description" ↵Sunny Goyal2015-10-012-0/+11
| |\ \ | | | | | | | | | | | | into ub-launcher3-burnaby-polish
| | * | Adding progress information for preload icons in content descriptionSunny Goyal2015-10-012-0/+11
| | | | | | | | | | | | | | | | | | | | Bug: 24086091 Change-Id: Id8fb024973f4affd998627d30077e2764b07edc4
* | | | Merge "Scale down drag views in spring-loaded workspace." into ↵Sunny Goyal2015-10-013-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | ub-launcher3-master
| * | | | Scale down drag views in spring-loaded workspace.Tony Wickham2015-10-013-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24190193 Change-Id: Ic490fc3f46702c3d5360e869c4172f31700085a1
* | | | | am 9ccacb54: Merge "Fixing \'Item removed\' announced twice when using ↵Sunny Goyal2015-10-012-10/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | accessible DnD" into ub-launcher3-burnaby-polish * commit '9ccacb544bfcb6b444edf09b1b37f955ae57168c': Fixing 'Item removed' announced twice when using accessible DnD
| * | | | Merge "Fixing 'Item removed' announced twice when using accessible DnD" into ↵Sunny Goyal2015-10-012-10/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish
| | * | | | Fixing 'Item removed' announced twice when using accessible DnDSunny Goyal2015-09-252-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d8781155619d22a41c3f363be7909d411c62fa9
* | | | | | am 2c4d2ccd: Merge "Don’t create dummy app info." into ↵Winson Chung2015-09-303-18/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish * commit '2c4d2ccd90e60541efffb980b70270d0bfe4e585': Don’t create dummy app info.
| * | | | | Merge "Don’t create dummy app info." into ub-launcher3-burnaby-polishWinson Chung2015-09-303-18/+21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Don’t create dummy app info.Winson2015-09-303-18/+21
| | | | | | | | | | | | | | | | | | | | Bug: 24539514 Change-Id: I5d14a4d9993e072451f8e7ed9a4cea219ae5d246
* | | | | am de7ae659: (-s ours) am 91dd0872: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-09-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'de7ae659ff91badf1aca55eab4a810b80508c097': Import translations. DO NOT MERGE
| * | | | am 91dd0872: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-09-300-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '91dd087271807980638a490fd8072d28a39ada8d': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-09-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22482938 Change-Id: Id607b75f77fe89ee801336c8bc3e7d7db3ad59fa
* | | | | | am 9fa63a37: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-09-300-0/+0
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | * commit '9fa63a3720d5ec33bc5d78f938f7bb91c8fae298': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-09-30146-4/+223
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f55cad49486a35efa5f85b54e894951b3e0964c Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-09-30154-81/+235
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife7a5bf14b206a74a7c4c8065cf0643d3beed6af Auto-generated-cl: translation import
* | | | | Merge "Create widget resize frame after spring loaded workspace has exited." ↵Tony Wickham2015-09-301-19/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into ub-launcher3-master
| * | | | | Create widget resize frame after spring loaded workspace has exited.Tony Wickham2015-09-291-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the resize frame was created as soon as a widget was dropped, but this caused it to be in the wrong spot after the spring loaded mode exited. Instead, we should wait until the workspace is back to normal before creating the resize frame. Bug: 24192073 Change-Id: I8d87febcc4ec7e3c44d50135184c3a837d7cd960
* | | | | | resolved conflicts for 850de64c to ub-launcher3-masterWinson2015-09-292-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Change-Id: Ica4893082f03afe76abd42dca44016eb9e436c35
| * | | | Merge "Fixing other missing cases of truncated sorts." into ↵Winson Chung2015-09-302-3/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | ub-launcher3-burnaby-polish
| | * | | Fixing other missing cases of truncated sorts.Winson2015-09-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24505761 Change-Id: I9b9358e8b134f0c4aac32ac536d9c8a1f0629957
* | | | | Merge "Drags originating in Folder exit spring loaded mode when completed." ↵Tony Wickham2015-09-302-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into ub-launcher3-master
| * | | | | Drags originating in Folder exit spring loaded mode when completed.Tony Wickham2015-09-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id020473a7a466fa98897455f48d3de7a3bc4997d
* | | | | | am 58ecbe40: Flipped widths of Nexus 4 and Nexus 5 in InvariantDeviceProfile.Tony Wickham2015-09-291-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '58ecbe40f6e95d53b74adeeea3fd83a32cea4f38': Flipped widths of Nexus 4 and Nexus 5 in InvariantDeviceProfile.
| * | | | | Flipped widths of Nexus 4 and Nexus 5 in InvariantDeviceProfile.Tony Wickham2015-09-291-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, Nexus 4 uses the Nexus 5 device profile and vice versa. But because the profiles have exactly the same values, it didn't matter that they were flopped. Change-Id: I3fd788e040feb8de5bb5f5e336acbd4ac995dc0f
* | | | | am c0880491: Highlighting sectioned apps on fast-scroll.Winson2015-09-2915-355/+682
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'c088049113c261331b5685e64050d14a31cd72df': Highlighting sectioned apps on fast-scroll.
| * | | | Highlighting sectioned apps on fast-scroll.Winson2015-09-2815-355/+682
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This CL fixes an old assumption we had about the height of rows in AllApps, and ensures that we account for the difference in height between the predictive icons and the normal icons. - In addition, we refactor FastBitmapDrawable to have multiple states, which it manages in drawing itself, including the press state and fast scroll focus states. And we also refactor some of the fast scroll logic in the all apps recycler view out to its own class. Change-Id: I1988159b2767df733bbbfc7dc601859cde6c9943
* | | | | am 51894540: am e1899e44: Merge "Adding size check when generating ↵Sunny Goyal2015-09-281-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | holographic outline" into ub-launcher3-burnaby * commit '5189454083640c81bf3a171422b3ef114f150a77': Adding size check when generating holographic outline
| * | | | am e1899e44: Merge "Adding size check when generating holographic outline" ↵Sunny Goyal2015-09-281-0/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into ub-launcher3-burnaby * commit 'e1899e44368f7602afc5b87a75102e7ff551982c': Adding size check when generating holographic outline
| | * | | Merge "Adding size check when generating holographic outline" into ↵Sunny Goyal2015-09-281-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby
| | | * | | Adding size check when generating holographic outlineSunny Goyal2015-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24426913 Change-Id: Ic7c9c767ea60ae4b25e064127105d94104233596
* | | | | | am 81284287: am de9590be: Adding null check when creating icon bitmapSunny Goyal2015-09-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81284287a761a9ee512bd7d4857995fdd8d8dcbc': Adding null check when creating icon bitmap
| * | | | | am de9590be: Adding null check when creating icon bitmapSunny Goyal2015-09-281-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de9590be4ca2779ae0f7f64a48ac8b90472484f8': Adding null check when creating icon bitmap
| | * | | | Adding null check when creating icon bitmapSunny Goyal2015-09-271-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 24299267 Change-Id: I596e4a8dbd4e45cffff75e6cf7bbbf7ec45c8ec9
* | | | | am f768d934: Fixing regression in L3 with search bar transition.Winson2015-09-252-20/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f768d934682ba80da89d454543928e629a44103d': Fixing regression in L3 with search bar transition.
| * | | | Fixing regression in L3 with search bar transition.Winson2015-09-252-20/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4155a653012c5d23df21167233fe766e5479347
* | | | | am 17e2d495: Use Long.compare() instead of truncating values for comparison.Winson2015-09-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '17e2d49547eb8d068b1ba816c6226cf5ef77369d': Use Long.compare() instead of truncating values for comparison.
| * | | | Use Long.compare() instead of truncating values for comparison.Winson2015-09-251-1/+1
| | | | | | | | | | | | | | | Bug: 24116808
* | | | | am cb20e0bc: Merge "Inform users when "Set wallpaper" fails." into ↵Tony Wickham2015-09-252-2/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish * commit 'cb20e0bc8eed5fb97ef49eda2c1a1ff514aa9e38': Inform users when "Set wallpaper" fails.