summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.Sunny Goyal2016-02-109-54/+125
|\ | | | | | | Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173
| * Merging search bar with all appsSunny Goyal2016-02-089-55/+126
| | | | | | | | Change-Id: I78577124cd3c05d52669c3e52b0294d6eb1d194d
* | Merge "Tweak spring-loaded workspace." into ub-launcher3-calgaryTony Wickham2016-02-083-2/+38
|\ \
| * | Tweak spring-loaded workspace.Tony Wickham2016-02-083-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No page indicators in spring-loaded mode - Don’t move workspace up as high - Scale workspace at 90% instead of 80% on phones - Increase speed of workspace -> spring-loaded -> workspace - Widgets were being scaled down twice when dragging from widget picker - Don't scale up icons when dragging (scaling other stuff down is enough) - Make scrim less dark and panels more transparent - Thin white border around page instead of highlight when hovering Change-Id: I963e91c20d4c0340480d165e0f3b8064783c0cb2
* | | resolve merge conflicts of 0e04980310 to ub-launcher3-calgary.Sunny Goyal2016-02-031-0/+85
|\ \ \ | |/ / |/| / | |/ Change-Id: Ic4526dfc388590aa0288936d827f19060922529f
| * Merge "Updating folder UI when icons are normalized > Increasing padding ↵Sunny Goyal2016-02-031-0/+85
| |\ | | | | | | | | | > Making the folder label bold and lighter color" into ub-launcher3-burnaby-polish
| | * Updating folder UI when icons are normalizedSunny Goyal2016-01-291-0/+85
| | | | | | | | | | | | | | | | | | | | | > Increasing padding > Making the folder label bold and lighter color Change-Id: Ib86d711c27cd03f366cdd35222d1f63f4a542f06
* | | resolve merge conflicts of b9759d399b to ub-launcher3-calgary.Tony Wickham2016-02-011-3/+6
|\| | | | | | | | | | | Change-Id: I66230c15e5eaeef316d4e2f14b85c6ff1b6e977d
| * | Add extra space for the search bar.Tony Wickham2016-02-011-3/+6
| |/ | | | | | | | | | | Also fixed a broken test. Change-Id: I1c270e69617528ea30f0e26a2101673e9b9fa63c
| * Removing some obsolete filesSunny Goyal2016-01-191-4/+0
| | | | | | | | Change-Id: I45cc23afcecb67163da99a9b81ace0021f723c9b
* | Merge "Adding support for negative x and y in layout xml. Fixing default ↵Sunny Goyal2016-01-064-9/+97
|\| | | | | | | | | | | | | | | | | configurations for some screen sizes." into ub-launcher3-burnaby-polish am: f7a263c437 * commit 'f7a263c4370d1e45bb53653de2ef0fb70061ecd5': Adding support for negative x and y in layout xml. Fixing default configurations for some screen sizes.
| * Adding support for negative x and y in layout xml.Sunny Goyal2015-12-184-9/+97
| | | | | | | | | | | | | | | | | | | | | | Fixing default configurations for some screen sizes. > Negative values for x and y are parsed as distance from end column and row respectively. e.g. (-1, -2) => (3, 2) in a 4x4 grid Bug: 26110981 Change-Id: I4ca30e225ed6e2a31610ab23235d2cd10e8d317c
* | Added config_springLoadWorkspace to enable/disable spring-loaded workspace.Tony Wickham2015-12-0419-0/+47
| | | | | | | | | | | | | | | | - Added side hints back - Only scale down icons if spring-loaded - Only show App Info drop target if spring-loaded Change-Id: I4b0dddccbe0e80b7ceb6b7266fc527f757744148
* | Merge "Increase spacing between icons in All Apps on tablets." into ↵Tony Wickham2015-12-041-0/+1
|\| | | | | | | | | | | | | | | | | ub-launcher3-burnaby-polish am: bcec69525d * commit 'bcec69525d8c4c64258f930608ab4e437368c058': Increase spacing between icons in All Apps on tablets.
| * Increase spacing between icons in All Apps on tablets.Tony Wickham2015-12-021-0/+1
| | | | | | | | Change-Id: If90332098f749295da07f4faca707a7a6965666b
* | resolve merge conflicts of a3c74d10a7 to ub-launcher3-master.Tony Wickham2015-10-301-5/+9
|\| | | | | | | Change-Id: Ibeb2499ac278e4094a2922501cfffad2489e58ed
| * Setting correct height for search bar widget options bundle.Tony Wickham2015-10-291-5/+9
| | | | | | | | | | | | | | | | | | | | - Seperate search bar height from its top and bottom paddings - Report this height plus 8dps top and bottom for the widget options - Use a separate bottom padding to adjust spacing between QSB and the workspace - Add tests to verify the height of the search bar in both normal and tall modes (ran on Nexus 6, 7, and 10) Change-Id: Ia7557785d1b38194eee869d0460456e8f33447d5
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-212-2/+2
| | | | | | | | | | Change-Id: I4f645e8f071559ad56ee7963934f1039b06d6e96 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-1973-73/+146
| | | | | | | | | | Change-Id: If930ef94a3abe3e27123d1fe3553b0a3a453ffec Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-10-212-2/+2
| | | | | | | | | | Change-Id: I24307dd5e2545f212c8be8cf6c1af303530ac051 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-10-1977-77/+154
| | | | | | | | | | Change-Id: Iab62cd0b92f647d639aea075133a9168dd7ee462 Auto-generated-cl: translation import
* | am 44b48f77: am 28c6b963: Showing a permission prompt for direct call shortcutsSunny Goyal2015-10-141-1/+4
|\| | | | | | | | | * commit '44b48f77027c386885ed459de501f9d822abac9c': Showing a permission prompt for direct call shortcuts
| * am 28c6b963: Showing a permission prompt for direct call shortcutsSunny Goyal2015-10-141-1/+4
| |\ | | | | | | | | | | | | * commit '28c6b963d4ccac73ab857c839420513dd560945c': Showing a permission prompt for direct call shortcuts
| | * Showing a permission prompt for direct call shortcutsSunny Goyal2015-10-121-1/+4
| | | | | | | | | | | | | | | Bug: 24580949 Change-Id: Idc92f9f5979a730f43b4905af2bc47b6834dc7a7
| * | Import translations. DO NOT MERGEGeoff Mendal2015-10-1273-77/+4
| | | | | | | | | | | | | | | Change-Id: I30deecd0fedace5365a877a8333206e7cb015afb Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-10-124-16/+10
| | | | | | | | | | | | | | | Change-Id: I8c8f3af2d54f551ce3ad381583c78590b4505d24 Auto-generated-cl: translation import
* | | resolved conflicts for fa3c369c to ub-launcher3-masterTony Wickham2015-10-091-0/+3
|\| | | | | | | | | | | Change-Id: I6bfc3d3b731a414060d86d4f1dfc5480c279edc9
| * | am 37860923: Merge "Added launcher callback to specify search bar height." ↵Tony Wickham2015-10-091-0/+3
| |\| | | | | | | | | | | | | | | | | | | into ub-launcher3-burnaby * commit '37860923619b1e467975a74764dff03ab657bdc7': Added launcher callback to specify search bar height.
| | * Merge "Added launcher callback to specify search bar height." into ↵Tony Wickham2015-10-091-0/+3
| | |\ | | | | | | | | | | | | ub-launcher3-burnaby
| | | * Added launcher callback to specify search bar height.Tony Wickham2015-10-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search bar can now be be normal or tall. When it is set to tall, the hotseat and page indicators move down so that the workspace isn't compressed quite as much. Change-Id: Id92a946eab3a93524999f92efd847a501a95f002
* | | | resolved conflicts for d70a4b7b to ub-launcher3-masterTony Wickham2015-10-082-0/+2
|\| | | | | | | | | | | | | | | Change-Id: Ib04f80eeebf551fc026925830fc4739d1c620513
| * | | am d6b4037b: Grid adjustments, specifically for Ryu.Tony Wickham2015-10-092-0/+2
| |\| | | | | | | | | | | | | | | | | | * commit 'd6b4037b093445fefa7d036da339dd549fae7a9b': Grid adjustments, specifically for Ryu.
| | * | Grid adjustments, specifically for Ryu.Tony Wickham2015-10-082-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Less than 14% of the screen is used for left/right workspace padding. (To be clear, this means 7% for the left and 7% for the right.) > Hotseat icons are the same size as workspace icons. > Far left and right hotseat edges line up with workspace edges. > All Apps button is scaled down 8dp. Bug: 24003478 Change-Id: Idb057ab0f6ba29e7fd93feac7573ca2e07c7e839
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-068-9/+9
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22482938 Change-Id: I758693c47b7d200da62bc1e9df4d0faaf9b147f2
| | * Import translations. DO NOT MERGEGeoff Mendal2015-09-302-4/+4
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22482938 Change-Id: Id607b75f77fe89ee801336c8bc3e7d7db3ad59fa
| * | Moving a few testing classes to a separate packageSunny Goyal2015-10-074-8/+4
| | | | | | | | | | | | Change-Id: Ied1c063de3e938695493e4937f554686e0719dad
| * | Import translations. DO NOT MERGEGeoff Mendal2015-10-071-4/+2
| | | | | | | | | | | | | | | Change-Id: Ibbe258e46dd396e9186a47b3881796e12f689e33 Auto-generated-cl: translation import
| * | Merge "Jailing the saved instance state of all the dynamically generated ↵Sunny Goyal2015-10-051-0/+3
| |\ \ | | | | | | | | | | | | views" into ub-launcher3-burnaby-polish
| | * | Jailing the saved instance state of all the dynamically generated viewsSunny Goyal2015-10-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using itemId instead of generating a new id for each item. This is because if the process gets killed, View.generateId will get reset but we will still receive the generated item id map in onRestoreInstance. This will cause conflicts with newly generated item ids. We wrap all the generated homescreen views inside a single sparse array. This ensures that we do not cause any conflict with dynamically generated views in other parts of the UI. Bug: 16840760 Change-Id: I6fe69c2e1dd463402f51222715fae31b9d4dd240
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-0573-13/+161
| | | | | | | | | | | | | | | | | | | | Change-Id: Id66043bc65557ef6a886bb1bec6ef18590a7056b Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-0777-235/+239
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifd0c7cf9752ab62bb006b5e09abcceed538d196a Auto-generated-cl: translation import
* | | | Removing some unused resourcesSunny Goyal2015-10-0513-135/+2
| | | | | | | | | | | | | | | | Change-Id: I6aa8a2d7eb4599ed2351c54fe0885839b5ba4521
* | | | Merge "Added 'Cancel' drop target from all apps and widget picker." into ↵Tony Wickham2015-10-053-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | ub-launcher3-master
| * | | | Added 'Cancel' drop target from all apps and widget picker.Tony Wickham2015-10-053-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 eaaed098: Merge "Adding progress information for preload icons in content ↵Sunny Goyal2015-10-011-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | description" into ub-launcher3-burnaby-polish * commit 'eaaed098a633eb5a5759778d5b015e11373a5e3d': Adding progress information for preload icons in content description
| * | | Adding progress information for preload icons in content descriptionSunny Goyal2015-10-011-0/+4
| |/ / | | | | | | | | | | | | Bug: 24086091 Change-Id: Id8fb024973f4affd998627d30077e2764b07edc4
| * | Import translations. DO NOT MERGEGeoff Mendal2015-09-3073-4/+150
| | | | | | | | | | | | | | | Change-Id: I9f55cad49486a35efa5f85b54e894951b3e0964c Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-09-3077-81/+158
| | | | | | | | | | | | | | | Change-Id: Ife7a5bf14b206a74a7c4c8065cf0643d3beed6af Auto-generated-cl: translation import
* | | resolved conflicts for e78e3d73 to ub-launcher3-masterSunny Goyal2015-09-251-0/+4
|\| | | | | | | | | | | Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6