summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-28 18:54:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 18:54:24 +0000
commit0e3c5e878c2da4f04c71b575bf20e7be41eee6cd (patch)
tree96beaf07307486f6491f022da63ebe381765d1a8
parente612775922ec9f8cc4e5cb976bc62b3312a3de0e (diff)
parent13ef17a37e683b8ad5800e9f542b411180fbec2f (diff)
downloadandroid_packages_apps_Trebuchet-0e3c5e878c2da4f04c71b575bf20e7be41eee6cd.tar.gz
android_packages_apps_Trebuchet-0e3c5e878c2da4f04c71b575bf20e7be41eee6cd.tar.bz2
android_packages_apps_Trebuchet-0e3c5e878c2da4f04c71b575bf20e7be41eee6cd.zip
am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts
* commit '13ef17a37e683b8ad5800e9f542b411180fbec2f': (500 commits) Adding minSpanX and minSpanY for all the launcher widgets [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets Query the title and icon for app using correct user handle. Fix issue where corp app widget doesn't show correctly on drop targets. [DO NOT MERGE] fixing build break Fixing AppWidgetInfo not initialized with proper user [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user Fix issue with UiThreadReveal on L devices Import translations. DO NOT MERGE Using highres icons for backup Import translations. DO NOT MERGE Widget row should not be cut off on the right, when there is an indent Fixing shortcuts not getting migrated to app icons Fixing regression in calculating workspace padding. Hide spammy WidgetModel log behind a DEBUG flag Import translations. DO NOT MERGE Animation should start and finish on widgets button when opening/closing widget tray. Making long-press of AllApps to jump directly to search. Computing the visible cell layout area without using the current scroll Fixing overscroll not drawn in rtl ...
0 files changed, 0 insertions, 0 deletions