summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove API that snuck into MockPackageManagerKenny Root2011-01-175-64/+0
| | | | | | | | | | We didn't release the get/setPackageObbPath API, but it snuck into MockPackageManager. However, it is not usable as a developer anyway. Removing it so it doesn't stay in the API forever. Cherry-pick from gingerbread Change-Id: I2083a8f398d983d53661c33270854442e34f9bc9
* Merge "Don't break the build... update to 11.xml." into honeycombRomain Guy2011-01-171-0/+10
|\
| * Don't break the build... update to 11.xml.Romain Guy2011-01-171-0/+10
| | | | | | | | Change-Id: I45482da4ffa5a9024d5284e0d2f6f41f4b38e8df
* | Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into ↵Romain Guy2011-01-175-4/+40
|\ \ | |/ | | | | honeycomb
| * Add BitmapFactory.Options.inMutable to load mutable bitmaps.Romain Guy2011-01-175-5/+41
| | | | | | | | Change-Id: Iaa222127520f3aa55072d44af12ee3477908b876
* | Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycombKenny Root2011-01-178-438/+0
|\ \
| * | Revert "Add the {get,set}PackageObbPaths calls to API"Kenny Root2011-01-178-438/+0
| | | | | | | | | | | | | | | | | | This reverts commit 5d40fe9c6846ba765072e50ed1254293cb9195e4. Change-Id: Ie41010c92fb860b19a12bcf63f6fe95ffa68da81
* | | Merge "Add internal plumbing to DPM for encryption" into honeycombAndy Stadler2011-01-175-68/+414
|\ \ \
| * | | Add internal plumbing to DPM for encryptionAndy Stadler2011-01-175-68/+414
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add code to persist per-admin setting * Add hooks for OS-level tie-in (is supported, get / set status) * Add 3rd API call to get OS status (irrespective of admin settings) * Remove "REQUESTED" status, no longer relevant with 3rd API * Fixed bug that impacted global proxy settings * Update api/11.xml to match current.xml Bug: 3346770 Change-Id: I56bdf9a7894f6ca4842402c7b82ddb3caf4b37b9
* | | Merge "Catching some edge cases while flinging/scrolling in NumberPicker" ↵Svetoslav Ganov2011-01-171-4/+4
|\ \ \ | |/ / |/| | | | | into honeycomb
| * | Catching some edge cases while flinging/scrolling in NumberPickerSvetoslav Ganov2011-01-171-4/+4
| | | | | | | | | | | | | | | | | | | | | 1. If the scroll is exactly divisible by the scroll item height the selector wheell is one off from the current value/text input. Change-Id: I12721e85a99f6a5b51f5ad6f13c3836cb156c9a4
* | | Merge "Start renaming FragmentTransaction.openTransaction() to ↵Dianne Hackborn2011-01-176-11/+27
|\ \ \ | | | | | | | | | | | | beginTransaction()." into honeycomb
| * | | Start renaming FragmentTransaction.openTransaction() to beginTransaction().Dianne Hackborn2011-01-176-11/+38
| | | | | | | | | | | | | | | | Change-Id: Ib4a6d824b33cca699b7b25159c491fb610d5f5da
* | | | Re-@hide some of the other StorageManager APIKenny Root2011-01-174-304/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some StorageManager API was accidentally unhidden during a bad merge. Re-@hide the API to fix it. Bug: 3362407 Change-Id: I5ad6925d3b6c18c33230127b1318c150d028a010
* | | | Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycombAdam Powell2011-01-171-2/+3
|\ \ \ \
| * | | | Fix bug 3360954 - Text overlaid on menu iconsAdam Powell2011-01-171-2/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie59a325b7037d93aeec01c862646f900d52e1d7c
* | | | | Merge "docs: update fragment docs with revised APIs, add sample code from ↵Scott Main2011-01-172-379/+546
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ApiDemos, and polish it up" into honeycomb
| * | | | | docs: update fragment docs with revised APIs, add sample code from ApiDemos, ↵Scott Main2011-01-162-379/+546
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and polish it up Change-Id: Ie5fb51d6a4109acec6dd403cde2b630df8724bba
* | | | | | Merge "Add OBB size to PackageStats" into honeycombKenny Root2011-01-174-0/+74
|\ \ \ \ \ \
| * | | | | | Add OBB size to PackageStatsKenny Root2011-01-174-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3356814 Change-Id: I4f871fb9fd0cb2f3177cc756631f95d928862571
* | | | | | | Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycombRomain Guy2011-01-171-2/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Prevent NPE when no indicator is specified.Romain Guy2011-01-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3362349 Change-Id: Ie15ed9e31fdd4eb72a18471375d8937c50eb1802
* | | | | | | Merge "Ensure that no callback is invoked while initializing DatePicker" ↵Svetoslav Ganov2011-01-171-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb
| * | | | | | | Ensure that no callback is invoked while initializing DatePickerSvetoslav Ganov2011-01-171-0/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:3360821 1. While my previous change:I3baff68c has partially fixed this bug it was still possible for a callback to be invoked on init. If a callback was already regitsered and the init is called the callback is incorrectly notified. Change-Id: I05c6cb78f4c7b7d2a00c52aef42c1698d9479be5
* | | | | | | Merge "Add back legacy layout for preference framework for compatibility." ↵Amith Yamasani2011-01-1710-50/+320
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb
| * | | | | | | Add back legacy layout for preference framework for compatibility.Amith Yamasani2011-01-1610-50/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3184831 Copied holo layouts to *_holo.xml and restored the old layouts for non-holo (pre-honeycomb) apps to use so that their layout assumptions aren't messed up. Change-Id: If4dcef16191a47a4b101da6bfb0c2df1757d1ae4
* | | | | | | | Merge "Delivering null cursor to loader callbacks." into honeycombJeff Hamilton2011-01-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Delivering null cursor to loader callbacks.Dmitri Plotnikov2011-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContentProviders are allowed to return null and both of our contact directories (Focus and Exchange) actually do when they find no data to return. The problem is that when LoaderManager receives a result from a loader, it checks if the result is the same as previously received. That's fine, as long as the loader always returns a different result. Now consider a loader that returns null when it cannot produce the result. What we are seeing is that if the loader is rapidly restared and returns null twice in a row, the null is never delivered to the callbacks. In the case of the reported bug, the scenario is this: 1. We look for "foo" 2. Data for "foo" comes from a directory and we display it 3. We hit backspace twice in rapid succession. Each time we hit backspace, the loader is restared, but since we do this very fast, the second restart overrides the first. So far so good. 4. The directories are programmed to return null if the query string is less than 3 characters long, so the loader returns null twice. 5. Loader manager looks at the final result, compares it to the previous result and since they are the same (both null) concludes that it does not need to deliver either of them. 6. The UI attempts to show the stale data and blows up Bug: 3352125 Change-Id: I3e5bc505faa03f72ebe5cb010377a740f5c7d5b6
* | | | | | | | Merge "Video editor API update - rework for Patch Set 3" into honeycombDharmaray Kundargi2011-01-1721-4667/+11183
|\ \ \ \ \ \ \ \
| * | | | | | | | Video editor API update - rework for Patch Set 3Santosh Madhava2011-01-1621-4667/+11183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
* | | | | | | | | Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-173-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | integrate videoeditor preview player.Dharmaray Kundargi2011-01-163-0/+8
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
* | | | | | | | | Merge "videoeditor JNI files on honeycomb" into honeycombDharmaray Kundargi2011-01-1716-0/+10645
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | videoeditor JNI files on honeycombDharmaray Kundargi2011-01-1616-0/+10645
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
* | | | | | | | | | Merge "Fix issue 3354692." into honeycombEric Laurent2011-01-171-10/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue 3354692.Eric Laurent2011-01-171-10/+32
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that SoundPool never calls the onLoadComplete() callback when load() method fails because the file cannot be opened. AudioService loadSoundEffects() was blocked waiting for a callback that never came. In this particular case, this happened on a specific build where sound effects assets were not included. The fix consists in waiting for the callback only if at least one sample is accepted by SoundPool load(). Also moved the initial loading of sound effect samples from the boot completed broadcast receiver to the audio service message handler to avoid waiting in the main system server thread. Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
* | | | | | | | | | Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycombRomain Guy2011-01-172-16/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Yet another fix for 9patch rendering.Romain Guy2011-01-172-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3362133 Change-Id: Ia6521d31a8c208a2ad2506a23b6a01e5e442ad86
* | | | | | | | | Hide USB mass storage APIs in StorageManagerKenny Root2011-01-173-140/+10
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They appear to have been unhidden in a bad merge from gingerbread. Change-Id: Ice0fc865425d5d885af3c2e90a7ffeaa1d623b80
* | | | | | | | Merge "Make ImageProcessing work." into honeycombShih-wei Liao2011-01-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make ImageProcessing work.Shih-wei Liao2011-01-171-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1ab91657ff4ba70a2391b168958e72b68e8a3e0
* | | | | | | | Merge "Implicitly/Explicitly subtypes bug." into honeycombsatok2011-01-162-7/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Implicitly/Explicitly subtypes bug.satok2011-01-172-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ccc22d4272ee92c0d8ba3f3c724d8f838d51310
* | | | | | | | Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and ↵Adam Powell2011-01-163-8/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
| * | | | | | | | Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE andAdam Powell2011-01-163-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FEATURE_ACTION_MODE_OVERLAY to coexist. Fix "custom title" dialog window decor for holo. Change-Id: Ia732caeb89e12d8d754be31c3bd2faf13a8c95d6
* | | | | | | | | Fixing bug related to collisions with AppWidget view ids and AppWidgetHost ↵Adam Cohen2011-01-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | view ids Change-Id: I2512b83078cff6c4d444c95275625ff39466ac83
* | | | | | | | | Merge "LayoutLib: extract resource resolution into its own class." into ↵Xavier Ducrohet2011-01-169-561/+652
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | honeycomb
| * | | | | | | | LayoutLib: extract resource resolution into its own class.Xavier Ducrohet2011-01-169-561/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Next step is to make it a jar that will also live in ADT. The version in layoutlib will be through a prebuilt jar file, like ninepatch. Also add ninepatch.jar inside the layoutlib.jar file. Change-Id: I4a0cc9f2dd99709de6408386054c6d4abae7c824
* | | | | | | | | Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" ↵Jim Miller2011-01-162-11/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb
| * | | | | | | | | Fix 3005526: Properly update StatusView from Password/PIN unlockJim Miller2011-01-162-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the newly added setHelpMessage() to properly show PIN and password help in StatusView. Change-Id: I8662e179e989c6e72f657c81f23b1b2fa7982727