summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c0d915de: am e40f5ce4: am 5845d3db: Make Launcher3 a privileged module so ...Adam Cohen2015-07-281-0/+1
|\
| * am e40f5ce4: am 5845d3db: Make Launcher3 a privileged module so it gets the B...Adam Cohen2015-07-281-0/+1
| |\
| | * am 5845d3db: Make Launcher3 a privileged module so it gets the BIND_APPWIDGET...Adam Cohen2015-07-281-0/+1
| | |\
| | | * Make Launcher3 a privileged module so it gets the BIND_APPWIDGET permissionAdam Cohen2015-07-271-0/+1
* | | | am 5bd11fd6: am 0e3c5e87: am 13ef17a3: (-s ours) merged ub-launcher3-burnaby,...Hyunyoung Song2015-07-280-0/+0
|\| | |
| * | | am 0e3c5e87: am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved...Hyunyoung Song2015-07-280-0/+0
| |\| |
| | * | am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflictsHyunyoung Song2015-07-280-0/+0
| | |\|
* | | | am 6ce4ac13: am e6127759: resolved conflicts for merge of 13ef17a3 to mnc-dr-...Hyunyoung Song2015-07-280-0/+0
|\| | |
| * | | am e6127759: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/2260940...Hyunyoung Song2015-07-280-0/+0
| |\| |
| | * | resolved conflicts for merge of 13ef17a3 to mnc-dr-devHyunyoung Song2015-07-22630-21563/+23677
* | | | am 680c92fe: resolved conflicts for merge of 13ef17a3 to cw-e-dev b/22609402 ...Hyunyoung Song2015-07-280-0/+0
|\| | |
| * | | resolved conflicts for merge of 13ef17a3 to cw-e-devHyunyoung Song2015-07-23630-21573/+23687
| |\ \ \ | | | |/ | | |/|
* | | | resolved conflicts for merge of 13ef17a3 to mnc-ub-devHyunyoung Song2015-07-23630-21520/+23794
|\ \ \ \ | | |/ / | |/| |
| * | | merged ub-launcher3-burnaby, and resolved conflictsHyunyoung Song2015-07-20630-21560/+23674
| |\ \ \
| | * \ \ am 249a510a: (-s ours) [DO NOT MERGE] Adding minSpanX and minSpanY for all th...Sunny Goyal2015-07-170-0/+0
| | |\ \ \
| | | * | | [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgetsSunny Goyal2015-07-163-10/+17
| | * | | | Merge "Adding minSpanX and minSpanY for all the launcher widgets" into ub-lau...Sunny Goyal2015-07-174-14/+34
| | |\ \ \ \
| | | * | | | Adding minSpanX and minSpanY for all the launcher widgetsSunny Goyal2015-07-174-14/+34
| | * | | | | Query the title and icon for app using correct user handle.Hyunyoung Song2015-07-161-5/+10
| | * | | | | Merge "Fix issue where corp app widget doesn't show correctly on drop targets...Hyunyoung Song2015-07-161-0/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix issue where corp app widget doesn't show correctly on drop targets.Hyunyoung Song2015-07-161-0/+2
| | * | | | | Merge "Fixing AppWidgetInfo not initialized with proper user" into ub-launche...Sunny Goyal2015-07-161-0/+1
| | |\ \ \ \ \
| | | * | | | | Fixing AppWidgetInfo not initialized with proper userSunny Goyal2015-07-151-0/+1
| | * | | | | | am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ub-laun...Sunny Goyal2015-07-160-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | 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
| | * | | | | | | am e48e570a: (-s ours) Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initial...Sunny Goyal2015-07-160-0/+0
| | |\| | | | | |
| | | * | | | | | Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" ...Sunny Goyal2015-07-161-1/+8
| | | |\| | | | |
| | | | * | | | | [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper userSunny Goyal2015-07-151-1/+8
| | * | | | | | | 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
| | * | | | | | | | am eb01b967: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-153-9/+9
| | * | | | | | | 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
| | * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-152-6/+6
| | * | | | | | | | Merge "Widget row should not be cut off on the right, when there is an indent...Hyunyoung Song2015-07-141-4/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Widget row should not be cut off on the right, when there is an indentHyunyoung Song2015-07-141-4/+6
| | * | | | | | | | Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-...Sunny Goyal2015-07-142-4/+4
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixing shortcuts not getting migrated to app iconsSunny Goyal2015-07-132-4/+4
| | * | | | | | | | | Merge "Fixing regression in calculating workspace padding." into ub-launcher3...Winson Chung2015-07-132-8/+15
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fixing regression in calculating workspace padding.Winson Chung2015-07-132-8/+15
| | * | | | | | | | | Merge "Hide spammy WidgetModel log behind a DEBUG flag" into ub-launcher3-bur...Hyunyoung Song2015-07-131-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | Hide spammy WidgetModel log behind a DEBUG flagHyunyoung Song2015-07-131-1/+3
| | * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-111-1/+1
| | |/ / / / / / /
| | * | | / / / / Animation should start and finish on widgets button when opening/closing widg...Hyunyoung Song2015-07-102-95/+45
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Making long-press of AllApps to jump directly to search.Winson Chung2015-07-104-20/+52
| | |/ / / / /
| | * | | | | Merge "Computing the visible cell layout area without using the current scrol...Sunny Goyal2015-07-092-45/+29
| | |\ \ \ \ \
| | | * | | | | Computing the visible cell layout area without using the current scrollSunny Goyal2015-07-092-45/+29
| | * | | | | | Merge "Adding bounds checking when updating container bounds." into ub-launch...Winson Chung2015-07-091-10/+26
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |