40249 Commits

Author SHA1 Message Date
Andy Stadler
d9bc2b5e9e am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb
* commit '2c12c708bfb62464e75dcde292547b2d778dafce':
  Add internal plumbing to DPM for encryption
2011-01-17 12:54:17 -08:00
Svetoslav Ganov
be0a092c87 am 59cce94e: Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb
* commit '59cce94eb8cecd484b467d7b855817116e4b13fc':
  Catching some edge cases while flinging/scrolling in NumberPicker
2011-01-17 12:54:14 -08:00
Andy Stadler
2c12c708bf Merge "Add internal plumbing to DPM for encryption" into honeycomb 2011-01-17 12:52:41 -08:00
Svetoslav Ganov
59cce94eb8 Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb 2011-01-17 12:52:18 -08:00
Andy Stadler
22dbfda976 Add internal plumbing to DPM for encryption
* 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
2011-01-17 12:47:31 -08:00
Svetoslav Ganov
6c742f1e95 Catching some edge cases while flinging/scrolling in NumberPicker
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
2011-01-17 12:46:21 -08:00
Dianne Hackborn
74871f9c37 am db7f3867: Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb
* commit 'db7f38673c33ba55801019007ff18fa4c57f75e0':
  Start renaming FragmentTransaction.openTransaction() to beginTransaction().
2011-01-17 12:35:59 -08:00
Dianne Hackborn
db7f38673c Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb 2011-01-17 12:33:50 -08:00
Kenny Root
3048abffae am f09d63a5: Re-@hide some of the other StorageManager API
* commit 'f09d63a52c84386a7b3539eab5b43f020f194c77':
  Re-@hide some of the other StorageManager API
2011-01-17 12:31:49 -08:00
Kenny Root
5f44e01265 am e26aa3f7: (-s ours) am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit 'e26aa3f78a33af5720e141e98a1ab0c77ef0456d':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:30:24 -08:00
Dianne Hackborn
48e7b45869 Start renaming FragmentTransaction.openTransaction() to beginTransaction().
Change-Id: Ib4a6d824b33cca699b7b25159c491fb610d5f5da
2011-01-17 12:28:35 -08:00
Kenny Root
e26aa3f78a am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '34d2b41e48281d1df2c844e004740f008e699093':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:23:43 -08:00
Adam Powell
dd9946e78a am 9512d6aa: Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb
* commit '9512d6aa206f8bb44ab52b6dfe5ee8cb5c2960ea':
  Fix bug 3360954 - Text overlaid on menu icons
2011-01-17 12:10:53 -08:00
Kenny Root
f09d63a52c Re-@hide some of the other StorageManager API
Some StorageManager API was accidentally unhidden during a bad merge.
Re-@hide the API to fix it.

Bug: 3362407
Change-Id: I5ad6925d3b6c18c33230127b1318c150d028a010
2011-01-17 12:10:48 -08:00
Scott Main
ab56c2ea67 am 47cd4d52: Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb
* commit '47cd4d521bf440042562b5cd1527facc4416b8dc':
  docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up
2011-01-17 12:08:50 -08:00
Adam Powell
9512d6aa20 Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb 2011-01-17 12:07:52 -08:00
Adam Powell
77769c7a91 Fix bug 3360954 - Text overlaid on menu icons
Change-Id: Ie59a325b7037d93aeec01c862646f900d52e1d7c
2011-01-17 12:06:14 -08:00
Scott Main
47cd4d521b Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb 2011-01-17 12:05:15 -08:00
Kenny Root
898954d746 am d37d6616: Merge "Add OBB size to PackageStats" into honeycomb
* commit 'd37d661669cc019faa93177aee9c6143eebe490f':
  Add OBB size to PackageStats
2011-01-17 12:03:18 -08:00
Kenny Root
d37d661669 Merge "Add OBB size to PackageStats" into honeycomb 2011-01-17 11:58:02 -08:00
Kenny Root
34d2b41e48 Revert "Add the {get,set}PackageObbPaths calls to API"
This reverts commit 6c4d904851772313930f800ac7c323cf90c709bb.

Going with a different tactic that doesn't dump stuff on
PackageManagerService.

Bug: 3214719
Change-Id: I0bbeccf3c21d264deda4256eb53713d2c98284f4
2011-01-17 11:49:22 -08:00
Romain Guy
cdf4442188 am bee8ec25: Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb
* commit 'bee8ec2538c75797d9704617411f831945c8da54':
  Prevent NPE when no indicator is specified. Bug #3362349
2011-01-17 11:41:36 -08:00
Svetoslav Ganov
79b780e011 am 424300f3: Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb
* commit '424300f3e4840bd06a1dbc22a25350c0589e3f89':
  Ensure that no callback is invoked while initializing DatePicker
2011-01-17 11:41:28 -08:00
Amith Yamasani
a46c4ce981 am a3aaad1f: Merge "Add back legacy layout for preference framework for compatibility." into honeycomb
* commit 'a3aaad1f7b4430cb7449767bb13fc1f43d688480':
  Add back legacy layout for preference framework for compatibility.
2011-01-17 11:41:17 -08:00
Jeff Hamilton
d0dbee2150 am b01856da: Merge "Delivering null cursor to loader callbacks." into honeycomb
* commit 'b01856da54892647afed260d017352d58648acc3':
  Delivering null cursor to loader callbacks.
2011-01-17 11:40:52 -08:00
Dharmaray Kundargi
b7d3312449 am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb
* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
  Video editor API update - rework for Patch Set 3
2011-01-17 11:40:27 -08:00
Dharmaray Kundargi
bf6ccb04b9 am 307003a8: Merge "integrate videoeditor preview player." into honeycomb
* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
2011-01-17 11:40:16 -08:00
Dharmaray Kundargi
f7465eb652 am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
  videoeditor JNI files on honeycomb
2011-01-17 11:40:11 -08:00
Romain Guy
bee8ec2538 Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb 2011-01-17 11:35:55 -08:00
Romain Guy
875862e3ec Prevent NPE when no indicator is specified.
Bug #3362349

Change-Id: Ie15ed9e31fdd4eb72a18471375d8937c50eb1802
2011-01-17 11:37:24 -08:00
Svetoslav Ganov
424300f3e4 Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb 2011-01-17 11:32:29 -08:00
Amith Yamasani
a3aaad1f7b Merge "Add back legacy layout for preference framework for compatibility." into honeycomb 2011-01-17 11:27:40 -08:00
Kenny Root
bcd6c96e75 Add OBB size to PackageStats
Bug: 3356814
Change-Id: I4f871fb9fd0cb2f3177cc756631f95d928862571
2011-01-17 11:21:52 -08:00
Svetoslav Ganov
3d20c846e4 Ensure that no callback is invoked while initializing DatePicker
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
2011-01-17 11:04:18 -08:00
Jeff Hamilton
b01856da54 Merge "Delivering null cursor to loader callbacks." into honeycomb 2011-01-17 11:03:40 -08:00
Romain Guy
7444da5126 Yet another fix for 9patch rendering.
Bug #3362133

Change-Id: Ia6521d31a8c208a2ad2506a23b6a01e5e442ad86
2011-01-17 10:53:44 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
2011-01-17 10:53:06 -08:00
Romain Guy
e99d5e6eb8 am cfe5dd01: Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb
* commit 'cfe5dd01f29acbb7393ffa91bb4b2a8ad43414f2':
  Yet another fix for 9patch rendering. Bug #3362133
2011-01-17 10:53:02 -08:00
Dharmaray Kundargi
9ed99405ae Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Dharmaray Kundargi
307003a844 Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
72b83b5938 Merge "Fix issue 3354692." into honeycomb 2011-01-17 10:51:46 -08:00
Romain Guy
cfe5dd01f2 Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 2011-01-17 10:51:32 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692.
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
2011-01-17 10:36:12 -08:00
Kenny Root
7b5b79e4bc am ec7c9ff0: Hide USB mass storage APIs in StorageManager
* commit 'ec7c9ff0bb1c98cb8bec3ec7bdacbae3a434fa53':
  Hide USB mass storage APIs in StorageManager
2011-01-17 09:55:31 -08:00
Dmitri Plotnikov
fd119e986d Delivering null cursor to loader callbacks.
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
2011-01-17 09:46:23 -08:00
Kenny Root
ec7c9ff0bb Hide USB mass storage APIs in StorageManager
They appear to have been unhidden in a bad merge from gingerbread.

Change-Id: Ice0fc865425d5d885af3c2e90a7ffeaa1d623b80
2011-01-17 09:15:36 -08:00
Shih-wei Liao
9dc76d53ed am 38f79d01: Merge "Make ImageProcessing work." into honeycomb
* commit '38f79d01db07f7cc3d3b49d594b675adfa8959d5':
  Make ImageProcessing work.
2011-01-17 01:20:42 -08:00
Shih-wei Liao
38f79d01db Merge "Make ImageProcessing work." into honeycomb 2011-01-17 01:18:32 -08:00
Shih-wei Liao
2aad562ab2 Make ImageProcessing work.
Change-Id: Id1ab91657ff4ba70a2391b168958e72b68e8a3e0
2011-01-17 01:17:39 -08:00