Jeff Hamilton
b0cae14175
Merge commit '446aea40' into manualmerge
...
Conflicts:
api/current.xml
Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
2011-01-24 16:31:38 -06:00
Joe Onorato
ab8967ae9d
am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb
...
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
Remove unwanted parameter (it was a typo).
2011-01-24 11:16:43 -08:00
Joe Onorato
e595cad6ee
Remove unwanted parameter (it was a typo).
...
Bug: 3241144
Change-Id: I569f6c8dffb17041a422be6084b6eab89624a57b
2011-01-24 09:25:35 -08:00
Joe Onorato
faf083ef0b
am 4c541b13: Merge "visibility ("lights out") API." into honeycomb
...
* commit '4c541b1303b0ee2b9b0d19bee85d3780c5c4c110':
visibility ("lights out") API.
2011-01-23 23:36:57 -08:00
Joe Onorato
4c541b1303
Merge "visibility ("lights out") API." into honeycomb
2011-01-23 19:26:13 -08:00
Joe Onorato
664644d9e0
visibility ("lights out") API.
...
1. Views may setSystemUiVisibility() to recommend that
the system chrome (status bar or other UI) show or hide
itself. (This functionality was previously available only
via the FLAG_FULLSCREEN window flag for some SystemUI
implementations.)
2. Views may register a OnSystemUiVisibilityChangedListener
on a view, and find out when the system UI actually
appears or disappears, allowing apps to coordinate the
appearance of their own UI if desired.
Bug: 3241144
Change-Id: Ia1758d94099182d49a1e3688ea2738ae4995b829
2011-01-23 19:22:52 -08:00
Dianne Hackborn
8c92a34294
am 9d97b63d: Honeycomb is now officially API 11.
...
* commit '9d97b63d0e0c7c9deb2d140c1dd579b51f52c1af':
Honeycomb is now officially API 11.
2011-01-23 15:19:09 -08:00
Dianne Hackborn
9d97b63d0e
Honeycomb is now officially API 11.
...
Change-Id: I5b11801468bf6ee2482f1ef201ece70ed9303bd8
2011-01-23 14:56:39 -08:00
Dianne Hackborn
38433e2dae
am b4ca900d: Merge "Final (hopefully) API cleanup." into honeycomb
...
* commit 'b4ca900d139f87547b23ae78a744df68a052e83e':
Final (hopefully) API cleanup.
2011-01-23 14:50:46 -08:00
Dianne Hackborn
b4ca900d13
Merge "Final (hopefully) API cleanup." into honeycomb
2011-01-23 14:48:09 -08:00
Dianne Hackborn
f3e735c2c3
Final (hopefully) API cleanup.
...
Change-Id: Iaac6b2ca399eda44458c2bc1a6501672b6c85b90
2011-01-23 14:43:11 -08:00
Dan Morrill
fe7006c5fc
am 9dbf1351: Merge "Adding faketouch feature." into honeycomb
...
* commit '9dbf1351e8cd1d8a320cdc7fecffc876fffb71f1':
Adding faketouch feature.
2011-01-23 14:18:52 -08:00
Dan Morrill
a537687c38
Adding faketouch feature.
...
Change-Id: Idff0b059c2f82fa4237d6238710e87dc55ae76a8
2011-01-23 13:36:13 -08:00
Nick Pelly
5cfbda1542
resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
...
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
2011-01-21 15:30:32 -08:00
Michael Kolb
b2b830774f
am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
Add public API for on screen zoom controls
2011-01-21 14:49:30 -08:00
Michael Kolb
5840cd294a
Add public API for on screen zoom controls
...
http://b/issue?id=3378224
This is a simple unhide.
Allow the use of WebView pinch-to-zoom gestures
without the on screen zoom controls.
Currently, enabling pinch to zoom with the public API also shows the
on screen zoom buttons.
If the zoom buttons are not wanted, a custom implementation of pinch to
zoom is required, which can't be done correctly at this point.
Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
2011-01-21 14:15:16 -08:00
Nick Pelly
8bb36dbbf3
resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp
...
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
2011-01-21 14:01:54 -08:00
Jeff Hamilton
446aea40eb
API changes for NFC.
...
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 12:33:49 -08:00
Gilles Debunne
34aa51b8f9
am 4569f1a5: Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
...
* commit '4569f1a561b4db77cc87f649e04c352415b65605':
Paste popup window is displayed on the side when it would be clipped on top of screen.
2011-01-21 11:32:30 -08:00
Gilles Debunne
e60e1e597b
Paste popup window is displayed on the side when it would be clipped on top of screen.
...
Bug 3259774
Change-Id: I6ea20452a3a235e264c91c112f52da7230657708
2011-01-21 10:34:43 -08:00
Nick Pelly
11ce84fcaa
resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp
...
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
2011-01-21 09:41:40 -08:00
Nick Pelly
8f912d1202
resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"
...
Conflicts:
api/current.xml
Change-Id: Ib6556fa54f49d4b55719dae79662d54f1530e76e
2011-01-21 08:55:38 -08:00
Adam Cohen
f95a963e73
am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
...
* commit 'cdd5626da62cb2dc013cded470e264232617f635':
Cleaning up some StackView bad behavior
2011-01-20 21:42:45 -08:00
Adam Powell
b6b4711648
am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
...
* commit '9a161b0981ad41169d006186979b7648a2acfd56':
SearchView API Review - bug 3370353 and bug 3370338
2011-01-20 21:42:31 -08:00
Adam Cohen
cdd5626da6
Merge "Cleaning up some StackView bad behavior" into honeycomb
2011-01-20 19:42:23 -08:00
Adam Powell
9a161b0981
Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
2011-01-20 18:44:32 -08:00
Stephen Hines
536f525ddb
am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
...
* commit '47171a7b65d841ed27940bb961f7934770c69440':
Properly use Long2 for "UInt2" for FieldPacker.
2011-01-20 18:31:39 -08:00
Adam Powell
01f2135465
SearchView API Review - bug 3370353 and bug 3370338
...
Renaming as per API council review
Change-Id: Id889be5a708fdc295ee50bb1b05014b2ff72122c
2011-01-20 18:30:10 -08:00
Stephen Hines
47171a7b65
Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
2011-01-20 18:27:43 -08:00
Dianne Hackborn
19fdccfdf8
am 11576102: Fix issue #3373438 : Update GBMR versions
...
* commit '11576102a9794ef964a08bc372dc09803f58997a':
Fix issue #3373438 : Update GBMR versions
2011-01-20 18:18:32 -08:00
Stephen Hines
e9f5c1894b
Properly use Long2 for "UInt2" for FieldPacker.
...
We were misusing this API, since it requires the additional precision of
the next size up on unsigned versions of types.
Change-Id: Ic3c87f681ac6705ae0b36a3464ce0d63737945fd
2011-01-20 18:17:25 -08:00
Adam Cohen
ef17dd497e
Cleaning up some StackView bad behavior
...
-> Issue: 3363564, 3320865
Change-Id: I32215478006a689f543532af4ce2267ccbb7fa56
2011-01-20 17:36:27 -08:00
Adam Powell
8bbec79447
am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb
...
* commit '9c91c7e27fbfff5abc34e19779a9477239ab9b10':
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
2011-01-20 17:06:35 -08:00
Adam Powell
1264c33163
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
...
Fix bug 3362453 - API REVIEW: android.app.ActionBar
Change-Id: I4e0233cd9355a47682bfe7b4a7fda39801586f1a
2011-01-20 13:25:08 -08:00
Dianne Hackborn
11576102a9
Fix issue #3373438 : Update GBMR versions
...
Change-Id: Ic4b4f1b0534fd2fbd6322eae01a4cb9d5a67cc6f
2011-01-20 12:16:43 -08:00
Svetoslav Ganov
f008667e6d
am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
...
* commit '1ec1fdfce959069f3092c15d27efc1c2286dc15c':
API REVIEW: android.widget.NumberPicker.OnValueChangedListener
2011-01-20 11:04:27 -08:00
Svetoslav Ganov
cedc446684
API REVIEW: android.widget.NumberPicker.OnValueChangedListener
...
Change-Id: I1e739553ab6b99b2768e42cf379a0b155dced81a
2011-01-20 10:41:14 -08:00
Ken Wakasa
7fff9d8e04
am 586f0513: Refine InputMethodInfo API
...
* commit '586f051375d8d7aeece05329921f9f66fc6164cb':
Refine InputMethodInfo API
2011-01-20 08:14:19 -08:00
Ken Wakasa
586f051375
Refine InputMethodInfo API
...
bug: 3370297
Change-Id: I2a18f3bdbe2fccb22e22cdae0f75aec5c703ad6d
2011-01-21 01:02:58 +09:00
Tadashi G. Takaoka
b1ba4367b6
am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb
...
* commit '317b2ea16a9ba681ee185d5b7a0c385a1fdbe1d5':
Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
2011-01-20 07:37:14 -08:00
Tadashi G. Takaoka
2548020c36
Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
...
Change-Id: Iecb7a9c265cafe96e7eec099341133da8e966f6f
2011-01-21 00:15:29 +09:00
Tadashi G. Takaoka
6c51e1fc9d
am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
...
* commit '90fcb2ad9378ee89f6795942c2b065a32bc83895':
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
2011-01-20 05:19:35 -08:00
Tadashi G. Takaoka
90fcb2ad93
Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
2011-01-20 05:17:51 -08:00
Tadashi G. Takaoka
f49688fa17
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
...
Change-Id: I27c318777355991ae4ad72d0b2480e93c8c5044e
2011-01-20 22:02:56 +09:00
Adam Cohen
695976ab8e
am 0e2de6d7: Addressing API Review docs bugs:
...
* commit '0e2de6d7187ef67ec00a2f2544450caa4a239c39':
Addressing API Review docs bugs:
2011-01-20 00:10:59 -08:00
Adam Cohen
0e2de6d718
Addressing API Review docs bugs:
...
->Issue 3370313
->Issue 3370403
->Issue 3370328
->kthx, bye
Change-Id: I2d1962c27b3ba856a0b4632d335271300bab45eb
2011-01-20 00:03:45 -08:00
Patrick Dubroy
ce06e78db1
am a6abd062: previewImage API shouldn\'t be hidden.
...
* commit 'a6abd062bf437fc69131a2797d6974953dd6cd83':
previewImage API shouldn't be hidden.
2011-01-19 21:45:06 -08:00
Patrick Dubroy
a6abd062bf
previewImage API shouldn't be hidden.
2011-01-19 21:39:01 -08:00
Jeff Brown
e200420e16
am d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
...
* commit 'd49f3e0078a79804e8dbd455c92786977a686020':
Rename KeyCharacterMap.UnavailableException.
2011-01-19 17:58:32 -08:00
Jeff Brown
7e1e21fdc5
Rename KeyCharacterMap.UnavailableException.
...
Bug: 3370261
Change-Id: I5cdca8ef2300b70b7a0fcc7e2c26765079645ecc
2011-01-19 17:32:50 -08:00