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
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
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
Adam Cohen
432589b046
am dc0b8323: am 50204584: Fixing StackView bug (Issue: 3321912)
...
* commit 'dc0b8323d4fbe9c41de674ef8b18dd4efab67846':
Fixing StackView bug (Issue: 3321912)
2011-01-16 23:06:36 -08:00
Patrick Dubroy
a409951f91
am c0147531: am e7218240: Merge "Add a method for clearing all animations on a thread." into honeycomb
...
* commit 'c01475318e0618219e9e56f274b38f6d3b76a9b1':
Add a method for clearing all animations on a thread.
2011-01-16 23:06:11 -08:00
Adam Powell
0acd32fddf
am 4b8bb8b0: am 70359ce2: Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb
...
* commit '4b8bb8b01aa9c2eb2b94318009d6e84387ee0b01':
Fix bug 3050138 - Action bar does not display correctly when many action items are added
2011-01-16 23:06:04 -08:00
Adam Cohen
efc47c52cf
am 760534a6: am 67e8915c: Merge "Fixing StackView bugs:" into honeycomb
...
* commit '760534a68aebc761bd12a9cccf76135cb3e5ce3d':
Fixing StackView bugs:
2011-01-16 23:05:39 -08:00
Kenny Root
a9d5188cc6
am d259468f: am fc28f412: Merge "Put externalSize measurements in PackageStats" into honeycomb
...
* commit 'd259468fe92b9714b45a134e781ce09681e70217':
Put externalSize measurements in PackageStats
2011-01-16 23:05:15 -08:00
Jim Miller
a3006a46d0
am 3530ebe4: resolved conflicts for merge of 578e73da to honeycomb-plus-aosp
...
* commit '3530ebe451fea39b159baa9b8c9f9cd851de42a3':
Fix 3106227: use WeakReferences for receivers in DigitalClock class
2011-01-16 23:04:55 -08:00
Jim Miller
93940bf835
am 04745768: am 717143ca: Fix 3339260: Remove emergency button from AccountUnlock screen
...
* commit '04745768f78f1930fa72e1ae435a48fb0c4d1637':
Fix 3339260: Remove emergency button from AccountUnlock screen
2011-01-16 23:03:28 -08:00
Romain Guy
b48e32803f
am aa00dd65: am 94677083: Merge "Fix 9patch rendering in ExpandableListView." into honeycomb
...
* commit 'aa00dd650ca1d9b9499bdb9bcdc7182b35fce0f0':
Fix 9patch rendering in ExpandableListView.
2011-01-16 23:03:11 -08:00
Patrick Dubroy
b1769b5d6c
am 8a0efde5: am 6e72ff90: Merge "Fix latent bug with reinitializing an ObjectAnimator." into honeycomb
...
* commit '8a0efde52a79e93809597736dc0de22a138d884c':
Fix latent bug with reinitializing an ObjectAnimator.
2011-01-16 23:02:48 -08:00
Joe Onorato
150c51d013
am bda28700: am c45389fd: Merge "fix the build... sorry... bad docs..." into honeycomb
...
* commit 'bda28700e3b61fbb18d24f62886bc366f444a54a':
fix the build... sorry... bad docs...
2011-01-16 23:02:15 -08:00
Patrick Dubroy
dd5abe2b2d
am 6943e5e8: am 149da0d4: Merge "Fix animation bugs caused by weak reference" into honeycomb
...
* commit '6943e5e8aefee2e89f76dcf989123e2139ca20be':
Fix animation bugs caused by weak reference
2011-01-16 23:01:49 -08:00
Dianne Hackborn
f2d4c9ec33
am 8a3a5320: am bdacefba: Merge "Change FLAG_FORWARD_LOCK back to its original value to not break things." into honeycomb
...
* commit '8a3a5320e616b79a227e5e1e4bc22b0b909925e1':
Change FLAG_FORWARD_LOCK back to its original value to not break things.
2011-01-16 23:01:38 -08:00
Joe Onorato
3ce6e50ece
am 4e0a956c: am 1ddf75a3: Merge "Change the default of how AsyncTask enqueues." into honeycomb
...
* commit '4e0a956c5a681bbd97b6718132f909affecf390c':
Change the default of how AsyncTask enqueues.
2011-01-16 23:00:59 -08:00
Romain Guy
8675b3f79d
am 761ae69b: am 3c372789: Merge "Don\'t dispatchDetachedFromWindow() if the View was not attached." into honeycomb
...
* commit '761ae69b7cb5639a5f468f258848578a6c8feb72':
Don't dispatchDetachedFromWindow() if the View was not attached.
2011-01-16 23:00:35 -08:00
Dianne Hackborn
3b403694be
am 64e30643: am c237bb27: Merge "Add manifest API to request a large heap." into honeycomb
...
* commit '64e306430570fcfb35a1b14e1b333ad114b23829':
Add manifest API to request a large heap.
2011-01-16 22:59:39 -08:00
Chet Haase
ac4e2cbbb1
am 15401dc2: am 598913a6: Merge "Remove obsolete DoubleEvaluator" into honeycomb
...
* commit '15401dc2c22d53bdecd7441370630b95fad8691c':
Remove obsolete DoubleEvaluator
2011-01-16 22:59:06 -08:00