17786 Commits

Author SHA1 Message Date
Kenny Root
9b4320f9db am a33dd09b: am d6c54d97: Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
* commit 'a33dd09b5cc62b50afc3a15cd8b67b5344756f1e':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 13:07:47 -08:00
Kenny Root
a33dd09b5c am d6c54d97: Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
* commit 'd6c54d97867edd566700c535f3edf57dd4396350':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 13:05:22 -08:00
Kenny Root
d6c54d9786 Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb 2011-01-17 13:02:48 -08:00
Kenny Root
a1cbb94dbc Revert "Add the {get,set}PackageObbPaths calls to API"
This reverts commit 5d40fe9c6846ba765072e50ed1254293cb9195e4.

Change-Id: Ie41010c92fb860b19a12bcf63f6fe95ffa68da81
2011-01-17 13:00:47 -08:00
Andy Stadler
c2e16f0cbd am d9bc2b5e: am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb
* commit 'd9bc2b5e9ef462c9fa4ac821e9d8d27ecff1dfaf':
  Add internal plumbing to DPM for encryption
2011-01-17 12:56:40 -08:00
Svetoslav Ganov
9419f2626c am be0a092c: am 59cce94e: Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb
* commit 'be0a092c876ce62c0683be921372e20435ad96d3':
  Catching some edge cases while flinging/scrolling in NumberPicker
2011-01-17 12:56:37 -08:00
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
f5245ddad2 am 74871f9c: am db7f3867: Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb
* commit '74871f9c370c6ec520820c0da606afbd77af6b4f':
  Start renaming FragmentTransaction.openTransaction() to beginTransaction().
2011-01-17 12:39:20 -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
Kenny Root
7a50f1c753 am 3048abff: am f09d63a5: Re-@hide some of the other StorageManager API
* commit '3048abffae72cd66ad2c8d440998dd4994ba7a8f':
  Re-@hide some of the other StorageManager API
2011-01-17 12:35:13 -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
Dianne Hackborn
48e7b45869 Start renaming FragmentTransaction.openTransaction() to beginTransaction().
Change-Id: Ib4a6d824b33cca699b7b25159c491fb610d5f5da
2011-01-17 12:28:35 -08:00
Adam Powell
562ce90ffd am dd9946e7: am 9512d6aa: Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb
* commit 'dd9946e78ae3884047efe875920ab0d5c38c3467':
  Fix bug 3360954 - Text overlaid on menu icons
2011-01-17 12:13:03 -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
Adam Powell
9512d6aa20 Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb 2011-01-17 12:07:52 -08:00
Kenny Root
c05dc09d27 am 898954d7: am d37d6616: Merge "Add OBB size to PackageStats" into honeycomb
* commit '898954d7469260c339eb776d0a3370b7dbcee720':
  Add OBB size to PackageStats
2011-01-17 12:06:35 -08:00
Adam Powell
77769c7a91 Fix bug 3360954 - Text overlaid on menu icons
Change-Id: Ie59a325b7037d93aeec01c862646f900d52e1d7c
2011-01-17 12:06:14 -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
Romain Guy
a552148cc4 am cdf44421: am bee8ec25: Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb
* commit 'cdf4442188158ac5c7e66b379c6d90b6e7459f5e':
  Prevent NPE when no indicator is specified. Bug #3362349
2011-01-17 11:53:48 -08:00
Svetoslav Ganov
bfc1ffcd36 am 79b780e0: am 424300f3: Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb
* commit '79b780e011ad77c240dfc81e1d03e4b610c0d715':
  Ensure that no callback is invoked while initializing DatePicker
2011-01-17 11:53:43 -08:00
Amith Yamasani
4a71eb0fa9 am a46c4ce9: am a3aaad1f: Merge "Add back legacy layout for preference framework for compatibility." into honeycomb
* commit 'a46c4ce9815b128c0aafc96de36a4d331bc1c741':
  Add back legacy layout for preference framework for compatibility.
2011-01-17 11:53:33 -08:00
Jeff Hamilton
b689c6dbea am d0dbee21: am b01856da: Merge "Delivering null cursor to loader callbacks." into honeycomb
* commit 'd0dbee21505b7aaa05e65d41792a2b47249f0110':
  Delivering null cursor to loader callbacks.
2011-01-17 11:53:29 -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
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
Kenny Root
87f11d7640 am 7b5b79e4: am ec7c9ff0: Hide USB mass storage APIs in StorageManager
* commit '7b5b79e4bc759b0a48c99a8edb28d932955e6117':
  Hide USB mass storage APIs in StorageManager
2011-01-17 09:57:23 -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
Adam Powell
98893db9dc am 4ba7f35e: am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
* commit '4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a':
  Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
2011-01-16 23:08:54 -08:00
Adam Cohen
b9efec8b3d am 0a654ae3: am d110889c: Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
* commit '0a654ae398a84858ed00326c75b8ca15516db880':
  Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
2011-01-16 23:08:46 -08:00
Jeff Brown
c886ff38c7 am fed9d654: am 5cdf0752: Merge "Support non-rectangular input regions." into honeycomb
* commit 'fed9d654e9f769a2d81682121faff01fee11555f':
  Support non-rectangular input regions.
2011-01-16 23:08:18 -08:00
Dianne Hackborn
c293a5627f am e27145d8: am 805fd7ee: Add API to get path to OBBs.
* commit 'e27145d83f144eb025f34985a02cda9cd5e0bcfe':
  Add API to get path to OBBs.
2011-01-16 23:08:00 -08:00
Jamie Gennis
8824624a3b am d97ea28b: am cf18c478: Merge "Implement SurfaceTexture frame-available callback." into honeycomb
* commit 'd97ea28b48b49c02cb9c0af015d1f11e8855d47b':
  Implement SurfaceTexture frame-available callback.
2011-01-16 23:07:50 -08:00