summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.Sunny Goyal2016-02-109-54/+125
|\
| * Merging search bar with all appsSunny Goyal2016-02-089-55/+126
* | Merge "Tweak spring-loaded workspace." into ub-launcher3-calgaryTony Wickham2016-02-083-2/+38
|\ \
| * | Tweak spring-loaded workspace.Tony Wickham2016-02-083-2/+38
* | | resolve merge conflicts of 0e04980310 to ub-launcher3-calgary.Sunny Goyal2016-02-031-0/+85
|\ \ \ | |/ / |/| / | |/
| * Merge "Updating folder UI when icons are normalized > Increasing padding ...Sunny Goyal2016-02-031-0/+85
| |\
| | * Updating folder UI when icons are normalizedSunny Goyal2016-01-291-0/+85
* | | resolve merge conflicts of b9759d399b to ub-launcher3-calgary.Tony Wickham2016-02-011-3/+6
|\| |
| * | Add extra space for the search bar.Tony Wickham2016-02-011-3/+6
| |/
| * Removing some obsolete filesSunny Goyal2016-01-191-4/+0
* | Merge "Adding support for negative x and y in layout xml. Fixing default conf...Sunny Goyal2016-01-064-9/+97
|\|
| * Adding support for negative x and y in layout xml.Sunny Goyal2015-12-184-9/+97
* | Added config_springLoadWorkspace to enable/disable spring-loaded workspace.Tony Wickham2015-12-0419-0/+47
* | Merge "Increase spacing between icons in All Apps on tablets." into ub-launch...Tony Wickham2015-12-041-0/+1
|\|
| * Increase spacing between icons in All Apps on tablets.Tony Wickham2015-12-021-0/+1
* | resolve merge conflicts of a3c74d10a7 to ub-launcher3-master.Tony Wickham2015-10-301-5/+9
|\|
| * Setting correct height for search bar widget options bundle.Tony Wickham2015-10-291-5/+9
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-212-2/+2
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-1973-73/+146
* | Import translations. DO NOT MERGEGeoff Mendal2015-10-212-2/+2
* | Import translations. DO NOT MERGEGeoff Mendal2015-10-1977-77/+154
* | am 44b48f77: am 28c6b963: Showing a permission prompt for direct call shortcutsSunny Goyal2015-10-141-1/+4
|\|
| * am 28c6b963: Showing a permission prompt for direct call shortcutsSunny Goyal2015-10-141-1/+4
| |\
| | * Showing a permission prompt for direct call shortcutsSunny Goyal2015-10-121-1/+4
| * | Import translations. DO NOT MERGEGeoff Mendal2015-10-1273-77/+4
* | | Import translations. DO NOT MERGEGeoff Mendal2015-10-124-16/+10
* | | resolved conflicts for fa3c369c to ub-launcher3-masterTony Wickham2015-10-091-0/+3
|\| |
| * | am 37860923: Merge "Added launcher callback to specify search bar height." in...Tony Wickham2015-10-091-0/+3
| |\|
| | * Merge "Added launcher callback to specify search bar height." into ub-launche...Tony Wickham2015-10-091-0/+3
| | |\
| | | * Added launcher callback to specify search bar height.Tony Wickham2015-10-081-0/+3
* | | | resolved conflicts for d70a4b7b to ub-launcher3-masterTony Wickham2015-10-082-0/+2
|\| | |
| * | | am d6b4037b: Grid adjustments, specifically for Ryu.Tony Wickham2015-10-092-0/+2
| |\| |
| | * | Grid adjustments, specifically for Ryu.Tony Wickham2015-10-082-0/+2
| | |/
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-068-9/+9
| | * Import translations. DO NOT MERGEGeoff Mendal2015-09-302-4/+4
| * | Moving a few testing classes to a separate packageSunny Goyal2015-10-074-8/+4
| * | Import translations. DO NOT MERGEGeoff Mendal2015-10-071-4/+2
| * | Merge "Jailing the saved instance state of all the dynamically generated view...Sunny Goyal2015-10-051-0/+3
| |\ \
| | * | Jailing the saved instance state of all the dynamically generated viewsSunny Goyal2015-10-051-0/+3
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-0573-13/+161
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-0777-235/+239
* | | | Removing some unused resourcesSunny Goyal2015-10-0513-135/+2
* | | | Merge "Added 'Cancel' drop target from all apps and widget picker." into ub-l...Tony Wickham2015-10-053-8/+8
|\ \ \ \
| * | | | Added 'Cancel' drop target from all apps and widget picker.Tony Wickham2015-10-053-8/+8
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-0577-13/+169
|/ / / /
* | | | am eaaed098: Merge "Adding progress information for preload icons in content ...Sunny Goyal2015-10-011-0/+4
|\| | |
| * | | Adding progress information for preload icons in content descriptionSunny Goyal2015-10-011-0/+4
| |/ /
| * | Import translations. DO NOT MERGEGeoff Mendal2015-09-3073-4/+150
* | | Import translations. DO NOT MERGEGeoff Mendal2015-09-3077-81/+158
* | | resolved conflicts for e78e3d73 to ub-launcher3-masterSunny Goyal2015-09-251-0/+4
|\| |