summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge "Update calls now we have an L API version." into ub-now-porkchopKenny Guy2014-09-188-20/+20
| |\ \ \ \ \
| | * | | | | Update calls now we have an L API version.Kenny Guy2014-09-188-20/+20
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17543647 Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
* | | | | | am 850d471b: Remove catch now api has hit googlefood.Kenny Guy2014-09-181-10/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '850d471b29f853d12cdba7104b3d8ba0159c9540': Remove catch now api has hit googlefood.
| * | | | | Remove catch now api has hit googlefood.Kenny Guy2014-09-181-10/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17543647 Change-Id: Ie0b57719393a705e8c02b226d3e3f57dbf43d800
* | | | | am 83e5941d: Fix NPE in WorkspaceAdam Cohen2014-09-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '83e5941d8ef6ca33bdd6278f6089c8d6d00de942': Fix NPE in Workspace
| * | | | Fix NPE in WorkspaceAdam Cohen2014-09-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 17503479 Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
* | | | am 136882c1: Merge "Setting context in LauncherAppState before initialising ↵Sunny Goyal2014-09-171-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | it, as it can be called from a BroadcastReceiver" into ub-now-porkchop * commit '136882c1950da1e5f0a24a8b6807b186a3297d8e': Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver
| * | | Merge "Setting context in LauncherAppState before initialising it, as it can ↵Sunny Goyal2014-09-171-0/+1
| |\ \ \ | | | | | | | | | | | | | | | be called from a BroadcastReceiver" into ub-now-porkchop
| | * | | Setting context in LauncherAppState before initialising it,Sunny Goyal2014-09-161-0/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | as it can be called from a BroadcastReceiver Bug: 17519159 Change-Id: I0434a3d1c392e8861eb759d88942deaf98116c19
* | | | am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchopSunny Goyal2014-09-171-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'd8293fbf284a8375da7473660c2ffeddfc08189e': Null check in flushInvalidIcons
| * | | Merge "Null check in flushInvalidIcons" into ub-now-porkchopSunny Goyal2014-09-171-1/+2
| |\ \ \
| | * | | Null check in flushInvalidIconsSunny Goyal2014-09-151-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Icons in a CacheEntry can be null, for a restored app. No need to flush such entries on DeviceProfileChange Bug: 17489687 Change-Id: If6e76206ae5bd8201c9928257706224f2f34c232
* | | | am 16fe1dfd: Merge "Updating shourcuts only when the corresponding user also ↵Sunny Goyal2014-09-171-15/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | matches the AppInfo" into ub-now-porkchop * commit '16fe1dfd30ee44be2c7c7f67b680afce875a3c3d': Updating shourcuts only when the corresponding user also matches the AppInfo
| * | | Merge "Updating shourcuts only when the corresponding user also matches the ↵Sunny Goyal2014-09-171-15/+28
| |\ \ \ | | | | | | | | | | | | | | | AppInfo" into ub-now-porkchop
| | * | | Updating shourcuts only when the corresponding user also matches the AppInfoSunny Goyal2014-09-121-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | issue: 17480447 Change-Id: I0afbd80e760b7b73b84e483be325b2e905d65a00
* | | | | am 72f98657: Merge "Using ApplicationContext in static objects" into ↵Sunny Goyal2014-09-173-7/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop * commit '72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9': Using ApplicationContext in static objects
| * | | | Merge "Using ApplicationContext in static objects" into ub-now-porkchopSunny Goyal2014-09-173-7/+5
| |\ \ \ \
| | * | | | Using ApplicationContext in static objectsSunny Goyal2014-09-153-7/+5
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 17507543 Change-Id: I1651b694acabaf62188dd4ba42739b64a60194c3
* | | | | am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchopDharmesh Mokani2014-09-173-33/+7
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit 'cc4e84ee3bf5be23b30dc06c3c861391e92ed633': Remove STOPSHIPs from GSA 4.0
| * | | Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchopDharmesh Mokani2014-09-173-33/+7
| |\ \ \ | | |/ / | |/| |
| | * | Remove STOPSHIPs from GSA 4.0Dharmesh Mokani2014-09-123-33/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stopships so that GSA won't crash on older L release. Bug: 17443440 Change-Id: I792eb53d5021118bdb09c44ffae7a8286a0cd69b
* | | | am a20490cd: Merge "Disabling debug logs" into ub-now-porkchopSunny Goyal2014-09-141-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'a20490cd9ee80d0dc8eb035d50853b48592cac5b': Disabling debug logs
| * | | Merge "Disabling debug logs" into ub-now-porkchopSunny Goyal2014-09-141-2/+2
| |\ \ \
| | * | | Disabling debug logsSunny Goyal2014-09-091-2/+2
| | | |/ | | |/| | | | | | | | | | | | | issue: 17327468 Change-Id: If0cd46e1309f58eed52e773ef15e3259df10c905
* | | | am 6a229267: Merge "Updating screenpanel assets" into ub-now-porkchopSunny Goyal2014-09-148-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '6a229267a4d08cc5544c7ad540ce18cc5c44226d': Updating screenpanel assets
| * | | Merge "Updating screenpanel assets" into ub-now-porkchopSunny Goyal2014-09-148-0/+0
| |\ \ \
| | * | | Updating screenpanel assetsSunny Goyal2014-09-128-0/+0
| | | |/ | | |/| | | | | | | | | | | | | Bug: 17414174 Change-Id: I05850fcd3802010160a604f3056a4b2ff3dc601d
* | | | am 10c7764d: Updating margin and content size for migration clingSunny Goyal2014-09-145-2/+13
|\| | | | | | | | | | | | | | | | | | | * commit '10c7764d0497b52c0286db409dda7fcc9a0d73bb': Updating margin and content size for migration cling
| * | | Updating margin and content size for migration clingSunny Goyal2014-09-125-2/+13
| |/ / | | | | | | | | | | | | Bug: 17446533 Change-Id: I1f980f0565083078ba4f5b7619938083367cbab7
* | | am 5b7d28fc: Merge "Turn off debugging for launch." into ub-now-porkchopChris Wren2014-09-122-2/+2
|\| | | | | | | | | | | | | | * commit '5b7d28fc4c44f9952ca6907b05f9f364c8d383aa': Turn off debugging for launch.
| * | Merge "Turn off debugging for launch." into ub-now-porkchopChris Wren2014-09-122-2/+2
| |\ \
| | * | Turn off debugging for launch.Chris Wren2014-09-122-2/+2
| | | | | | | | | | | | | | | | Bug: 17483474 Change-Id: I8dd24ba08ffe0773f4d68739b30b829021d69902
* | | | Merge "Fixing wrong views being made visible when opening all apps" into ↵Sunny Goyal2014-09-121-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop automerge: 37b44cc * commit '37b44cc1a4794cbe6145053dce82cc8cef38eb3b': Fixing wrong views being made visible when opening all apps
| * | | Merge "Fixing wrong views being made visible when opening all apps" into ↵Sunny Goyal2014-09-121-4/+1
| |\ \ \ | | | | | | | | | | | | | | | ub-now-porkchop
| | * | | Fixing wrong views being made visible when opening all appsSunny Goyal2014-09-101-4/+1
| | | |/ | | |/| | | | | | | | | | | | | issue: 17422327 Change-Id: I18175ecba154dff3ff5d7e1b16696ca46c7aeae8
* | | | Merge "Update compat layer for API review changes to LauncherApps" into ↵Kenny Guy2014-09-121-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-porkchop automerge: cb213ba * commit 'cb213ba78ea66ea6576cbe46ec83ebb1e2f904e0': Update compat layer for API review changes to LauncherApps
| * | | Merge "Update compat layer for API review changes to LauncherApps" into ↵Kenny Guy2014-09-121-2/+10
| |\ \ \ | | | | | | | | | | | | | | | ub-now-porkchop
| | * | | Update compat layer for API review changes to LauncherAppsKenny Guy2014-09-111-2/+10
| | |/ / | | | | | | | | | | | | | | | | Bug:17390765 Change-Id: I15a927402a05387b14a2a6899fd513fc59a2ee41
* | | | am 393afd34: Dogfood Crash Loop : Fixing crash loop by try and catchDharmesh Mokani2014-09-111-2/+11
|\| | | | | | | | | | | | | | | | | | | * commit '393afd34566ba51f817c45a55305a9ac150d7f5b': Dogfood Crash Loop : Fixing crash loop by try and catch
| * | | Dogfood Crash Loop : Fixing crash loop by try and catchDharmesh Mokani2014-09-111-2/+11
| | | | | | | | | | | | | | | | | | | | Bug: 17467377 Change-Id: Idb2084339323b4953cbd6bbde2735f814fb75a76
* | | | am 49909c2b: Catch Throwable as NoSuchMethodError isn\'t an Exception.Kenny Guy2014-09-112-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit '49909c2b336de95de2543af0ebe3b7554fe05a6c': Catch Throwable as NoSuchMethodError isn't an Exception.
| * | | Catch Throwable as NoSuchMethodError isn't an Exception.Kenny Guy2014-09-112-4/+4
| |/ / | | | | | | | | | | | | Bug: 17462165 Change-Id: Ifafdc882fd1020fb6468d2bcae2f219ef5cba64c
* | | am 8e894faa: Fixing a couple issues with bad AllApps stateAdam Cohen2014-09-091-0/+22
|\| | | | | | | | | | | | | | * commit '8e894faadfce1d779b94692d8c7eccf558e23727': Fixing a couple issues with bad AllApps state
| * | Fixing a couple issues with bad AllApps stateAdam Cohen2014-09-091-0/+22
| |/ | | | | | | | | | | Bug 17388923 Change-Id: I8f8a0163c0172d6f286a55d89793b843b092a3ca
* | am 0f668f3c: Prevent GNL from crashing on JBAdam Cohen2014-09-092-3/+20
|\| | | | | | | | | * commit '0f668f3c2be93ad9be221d868abb3d9a6e418f18': Prevent GNL from crashing on JB
| * Prevent GNL from crashing on JBAdam Cohen2014-09-092-3/+20
| | | | | | | | | | issue 17433546 Change-Id: Ie5071e516b26400a27473eaaa401023f1af1d840
* | am 55f77f98: Merge "Showing clings only after the intro has completed" into ↵Adam Cohen2014-09-091-12/+17
|\| | | | | | | | | | | | | ub-now-porkchop * commit '55f77f983afeffd2240ccd24d783e6d8d3ab44fd': Showing clings only after the intro has completed
| * Merge "Showing clings only after the intro has completed" into ub-now-porkchopAdam Cohen2014-09-091-12/+17
| |\
| | * Showing clings only after the intro has completedSunny Goyal2014-09-081-12/+17
| | | | | | | | | | | | | | | issue: 17408736 Change-Id: Ife2261f717003e828e8032b17c51e34b1ec02ecf
* | | am f9847b9b: Launcher change corresponding to platform change.Dharmesh Mokani2014-09-083-13/+30
|\| | | | | | | | | | | | | | * commit 'f9847b9bd3e5286fe10667ec12dab5b4c43355fa': Launcher change corresponding to platform change.