2363 Commits

Author SHA1 Message Date
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
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
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
Jason Sams
39b38919c2 am 9dd9d021: Merge "Expose unchecked copyFrom variants." into honeycomb
* commit '9dd9d021896e350df983baf7174d980a43533e69':
  Expose unchecked copyFrom variants.
2011-01-19 16:28:41 -08:00
Jason Sams
9dd9d02189 Merge "Expose unchecked copyFrom variants." into honeycomb 2011-01-19 16:27:06 -08:00
Mike Lockwood
3c1f64c4ad am 62097ad6: Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb
* commit '62097ad654bcab30057f56b46bbac5c41cfe9ec0':
  @hide MediaStore.ACTION_MTP_SESSION_END
2011-01-19 16:11:55 -08:00
Mike Lockwood
62097ad654 Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb 2011-01-19 16:09:49 -08:00
Mike Lockwood
e222872a77 @hide MediaStore.ACTION_MTP_SESSION_END
BUG: 3370230

Change-Id: Idc05512930ceab8f91e3ddf0969a3b17deab2f62
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 16:07:25 -08:00
Jason Sams
4fa3eed8e0 Expose unchecked copyFrom variants.
Change-Id: I452d082bb4adbd578b6300bf5829dc59e91e517a
2011-01-19 15:44:38 -08:00
Brad Fitzpatrick
bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
2011-01-19 15:19:08 -08:00
Brad Fitzpatrick
9240f16d77 Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb 2011-01-19 14:53:24 -08:00
Brad Fitzpatrick
bfbe577110 StrictMode: class instance limits (track object "leaks")
Change-Id: I2db5a19060c2013078feb88a91caf655469b2f98
2011-01-19 14:52:08 -08:00
Svetoslav Ganov
1ebd8c11f7 am 4243dc39: Updated the Time/Date pickers to be backwards compatible
* commit '4243dc394d89a93cb207efa36e9755c2424d688b':
  Updated the Time/Date pickers to be backwards compatible
2011-01-19 12:37:36 -08:00
Svetoslav Ganov
4243dc394d Updated the Time/Date pickers to be backwards compatible
bug:3349400

Change-Id: I2a3dda82caf7de0ed203306c89ee774b94b7d82e
2011-01-19 12:35:17 -08:00
Adam Cohen
9f97174b9b am c446ae83: Merge "Removing deprecated widget api method." into honeycomb
* commit 'c446ae83e08fb451589dbacba9aa3f89d0d6acb0':
  Removing deprecated widget api method.
2011-01-19 11:49:44 -08:00
Winson Chung
0fd9be2118 Removing deprecated widget api method.
Change-Id: I0610dcb5cf1001b2b7e86d78a88addf174cedd77
2011-01-19 11:44:25 -08:00
Jean-Michel Trivi
3ebe75cc51 am 928e48f2: Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb
* commit '928e48f2bae9816fb5b3f1444f8ca9a4de15d8c3':
  Fix bug 2084122: enable application control over text synth volume
2011-01-19 09:14:57 -08:00
Jean-Michel Trivi
928e48f2ba Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb 2011-01-19 09:13:04 -08:00
Winson Chung
caedec768b am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb
* commit 'aac197833f3b2deddc6b3da5c144be36721d9547':
  Refactoring app widgets to address security/performance issues.
2011-01-18 23:05:38 -08:00
Winson Chung
81f39eb6e7 Refactoring app widgets to address security/performance issues.
- Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services
- Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission

Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
2011-01-18 22:57:09 -08:00
Christopher Tate
31cd02ade3 am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
* commit '17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
  API CHANGE: add a no-View ctor for DragShadowBuilder
2011-01-18 18:36:06 -08:00
Jack Palevich
79f74eda8a am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
* commit 'a228e4f833b96e0633571735c2363e30363e155c':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
2011-01-18 18:35:42 -08:00
Nick Pelly
b6b426ad1c Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 2011-01-18 16:10:48 -08:00