OSDN Git Service

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
[android-x86/packages-apps-Launcher3.git] / src / com / android / launcher3 / compat / AppWidgetManagerCompatVL.java
2015-07-22 Hyunyoung Songresolved conflicts for merge of 13ef17a3 to mnc-dr-dev
2015-01-31 Sunny Goyalam 2fce90c3: Cleaning up icon resizing code
2015-01-31 Ian Parkinsonam 33de9454: am 0c2918f4: Use View.generateViewId if...
2015-01-31 Helena Josolam b2331f66: Merge "Create a central list of files...
2015-01-31 Adam Cohenam e2f25947: am 4b8d11fc: Add missing xxhdpi asset
2015-01-31 Kenny Guyam ebb2a66b: am 0cd27191: Merge "Remove reference to...
2015-01-31 Adam Cohenam adf571c7: am 52077b7a: Merge "Don\'t let old Launche...
2015-01-31 Bjorn Bringertam ebdb7fcc: am 2ed99e86: Build Launcher3 against prebu...
2015-01-31 Sunny Goyalam 10d03955: am 6d467e27: Merge "Resetting launcherProv...
2015-01-31 Baligh Uddinam f82c86c2: (-s ours) am 10047138: (-s ours) Merge...
2015-01-31 Sunny Goyalam fdff96d3: am c5fb59fb: Fixing loadWorkspace being...
2015-01-31 Sunny Goyalam e9461be3: am f876301d: UI Fixes
2015-01-31 Sameer Padalaam 8fd74831: Source change to get code compiling on...
2015-01-31 Adam Cohenam 12429e46: am d8f6253e: Merge "When ensuring screen...
2015-01-31 Baligh Uddinam a703eb0f: (-s ours) am 68207e25: (-s ours) Merge...
2015-01-31 Baligh Uddinam 153c3ddc: (-s ours) Merge "Import translations....
2015-01-31 Sunny Goyalam f2316a73: am acefecbf: Merge "Updating promise icon...
2015-01-31 Sunny Goyalam 06f4dc5d: am 7e053f87: Merge "Changing intent action...
2015-01-31 Sunny Goyalam cb0ec764: am 66af82cc: Merge "Adding support to...
2015-01-31 Sunny Goyalam 2e9eb2a6: am 92e97dcc: Merge "Fix: First run cling...
2015-01-31 Adam Cohenam 0d89e1d7: am ddd5aaaf: Merge "Perform null check...
2015-01-31 Kenny Guyam e4bafbb3: am c0b89b72: Merge "Update calls now we...
2015-01-31 Kenny Guyam a7b95f2a: am 850d471b: Remove catch now api has...
2015-01-31 Adam Cohenam 90f9f957: am 83e5941d: Fix NPE in Workspace
2015-01-31 Sunny Goyalam 3fcb2c75: am 136882c1: Merge "Setting context in...
2015-01-31 Sunny Goyalam 7b0982d8: am d8293fbf: Merge "Null check in flushInv...
2015-01-31 Sunny Goyalam 4824965f: am 16fe1dfd: Merge "Updating shourcuts...
2015-01-31 Sunny Goyalam bc60df98: am 72f98657: Merge "Using ApplicationConte...
2015-01-31 Dharmesh Mokaniam ae5c0ad2: am cc4e84ee: Merge "Remove STOPSHIPs from...
2015-01-31 Sunny Goyalam 88a6301e: am a20490cd: Merge "Disabling debug logs...
2015-01-31 Sunny Goyalam 97205636: am 6a229267: Merge "Updating screenpanel...
2015-01-31 Sunny Goyalam 8b808c71: am 10c7764d: Updating margin and content...
2015-01-31 Chris Wrenam 05702ccf: am 5b7d28fc: Merge "Turn off debugging...
2015-01-31 Sunny Goyalam 6c589c27: Merge "Fixing wrong views being made visib...
2015-01-31 Kenny Guyam fb7eae5a: Merge "Update compat layer for API review...
2015-01-31 Dharmesh Mokaniam d23e2cda: am 393afd34: Dogfood Crash Loop : Fixing...
2015-01-31 Kenny Guyam d4aeed33: am 49909c2b: Catch Throwable as NoSuchMeth...
2015-01-31 Adam Cohenam f7ce4d4e: am 8e894faa: Fixing a couple issues with...
2015-01-31 Adam Cohenam b6711ac0: am 0f668f3c: Prevent GNL from crashing...
2015-01-31 Adam Cohenam 7c938d99: am 55f77f98: Merge "Showing clings only...
2015-01-31 Dharmesh Mokaniam 3e1897b3: am f9847b9b: Launcher change corresponding...
2015-01-31 Adam Cohenam 94e83e36: am a38dc901: Ensure all apps button ininti...
2015-01-31 Adam Cohenam d64910c4: am cd145285: Second half of workaround...
2015-01-31 Adam Cohenam 03acedd5: am c761d3cf: Workaround for all apps crash...
2015-01-31 Sunny Goyalam e962acef: am 6fdf6b22: Merge "Fixing Intrinsic dimen...
2015-01-31 Sunny Goyalam 0cc5a656: am 5bb4c94a: Merge "Don\'t remove content...
2015-01-31 Sunny Goyalam 7ee999a0: am 9b8da88e: Fixing install shortcut recei...
2015-01-31 Sunny Goyalam 65d0a198: am 1c13ff56: Merge "Handling label and...
2015-01-31 Sunny Goyalam 4e71785a: am 66205ce9: Merge "Updating content of...
2015-01-31 Adam Cohenam 9bc8f5bf: am a3b8866c: Merge "Add ability for Partne...
2015-01-31 Adam Cohenam c665e363: am 0d2adfbb: Potential fix for a couple...
2015-01-31 Jason Monkam dace26c4: am 6a2c7785: Add sdk version guard to...
2015-01-31 Ian Parkinsonam e4ad5070: am 25ad9e4e: Merge "Give GEL a way to...
2015-01-31 Baligh Uddinam b17186c7: (-s ours) am bc566e74: (-s ours) Merge...
2015-01-31 Baligh Uddinam 266749b5: (-s ours) Merge "Import translations....
2015-01-31 Kenny Guyam 280e9c2b: am 49d5ca18: Merge "Updated calls for...
2015-01-31 Adam Cohenam 033e62d1: am 2854d256: All apps transition work
2015-01-31 Sunny Goyalam e7261692: am d750f8b3: Merge "Clear the promise...
2015-01-31 Sunny Goyalam bf3706f0: am 83acc755: Merge "Clear the draginfo...
2015-01-31 Adam Cohenam cf29e8a8: am 67ef1c40: Merge "Fix regression which...
2015-01-31 Sunny Goyalam f4365b5c: am fbfa2cc6: Removing unused cling resources.
2015-01-31 Sunny Goyalam 22396b08: am d5058a53: Merge "Improving restored...
2015-01-31 Sunny Goyalam 31722000: am e3b36d51: Merge "Updating Clings UI...
2015-01-31 Dharmesh Mokaniam 93423259: am 74dc410b: Merge "Remove StopShip from...
2015-01-31 Baligh Uddinam 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge...
2015-01-31 Sunny Goyalam 8494d77b: am 424418bb: Updating clings, removing...
2015-01-31 Sunny Goyalam da38d0d3: am dec12adb: Merge "Changing hotseat keybo...
2015-01-31 Adam Cohenam 1baa1765: am 94afab4f: Fix all apps transition for...
2015-01-31 Adam Cohenam 9a6cd28f: am c78f562a: Merge "Update adjacent page...
2015-01-31 Baligh Uddinam 132f44ca: (-s ours) am bdfc17ce: (-s ours) Merge...
2015-01-31 Sunny Goyalam 82f10acf: am 883077a2: Merge "Adding strings for...
2015-01-31 Jason Monkam c5a764f6: am 266a91db: Merge "Change URI favorite...
2015-01-31 Sunny Goyalam e585ce00: am ffe83f13: Adding support for managed...
2015-01-31 Sunny Goyalam 7d88429c: am 22308ce1: Merge "Updating the icon...
2015-01-31 Jan-Willem Maarseam 8a3f1b6b: am 21116068: Merge "Ignore generic motion...
2015-01-31 Adam Cohenam 91402c8e: am c50438c8: Unify next / prev page hints...
2015-01-31 Sunny Goyalam f95761eb: am f8177d38: Merge "Saving the system...
2015-01-31 Adam Cohenam 4c2d760b: am 178879c7: Merge "Updating folder open...
2015-01-31 Sunny Goyalam fdeab320: am 800a4f21: Fixing class name change...
2015-01-31 Sunny Goyalam 2db95a60: am 4a0eda76: Merge "Updating the UI for...
2015-01-31 Adam Cohenam 4292dd64: am 1e4359c5: Adding dampened snap back...
2015-01-31 Sunny Goyalam 8a5557de: am ac11d416: Merge "Updating virtual prelo...
2015-01-31 Adam Cohenam f81eb912: am b8d9e909: Merge "Get rid of pages overh...
2015-01-31 Baligh Uddinam e8f27a97: (-s ours) am 916421ca: (-s ours) Merge...
2015-01-31 Baligh Uddinam ce2e385c: (-s ours) Merge "Import translations....
2015-01-31 Adam Cohenam a92e06de: am a00673c7: Fix issues with the new widge...
2015-01-31 Adam Cohenam 6c45b7f0: am 63f1ec00: Further refinement of all...
2015-01-31 Sunny Goyalam 94d7fd42: am 0fc1be16: Updating the ui for widget...
2015-01-31 Sunny Goyalam 29f6caa0: am 0fe505bf: Autoinstalls loading xml
2015-01-31 Sunny Goyalam cb7898ef: am e3a55a9f: Merge "Updating the virtual...
2015-01-31 Sameer Padalaam 81b32966: am 056cf62b: Merge "Update code so it...
2015-01-31 Adam Cohenam a027e9c7: am 6551b7ef: Merge "Updating the widget...
2015-01-31 Mark Brophyam 24f64263: am 5337aea1: Merge "Revert "Updating the...
2015-01-31 Sunny Goyalam d80f8258: am d3ad9828: Merge "Adding support to...
2015-01-31 Adam Cohenam 4cfc7a91: am 77c1376c: Merge "Updating the widget...
2015-01-31 Adam Cohenam 9556fb17: am 1c4547bd: Merge "Polishing the AllApps...
2015-01-31 Mark Brophyam 37d1c0e1: am fd449c88: Make GEL not crashloop.
2015-01-31 Dharmesh Mokaniam 597a8ec8: am 6075170b: Changes corresponding to...
2015-01-31 Adam Cohenam 382d8606: am 36f82a32: Merge "Fix screen issues...
2015-01-31 Adam Cohenam b6c156fe: am a66233ae: Merge "Add partner customizat...
next