2320 Commits

Author SHA1 Message Date
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
Nick Pelly
e5099cd3f5 am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
* commit 'b7d6ffd76f6c47af488494f5de9560ec490e8241':
  Change signature of MifareClassic.authenticate*() to throw IOException.
2011-01-18 18:56:45 -08:00
Nick Pelly
0316d4a24f Change signature of MifareClassic.authenticate*() to throw IOException.
Update API for this and the previous commit.

Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
2011-01-18 18:52:37 -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
Christopher Tate
17ed60c3d2 API CHANGE: add a no-View ctor for DragShadowBuilder
Cf conversation with the API council.  Also expand the javadoc
a bit.

Change-Id: I9d4edb1042e00492b3db5c6bb7c7d9648581efad
2011-01-18 16:07:06 -08:00
Jack Palevich
a228e4f833 Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 2011-01-18 15:54:29 -08:00
Jack Palevich
75f2bc04df Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
2011-01-18 15:53:25 -08:00
Nick Pelly
06a00bd2d2 Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
The later feels less clumsy.

Change-Id: I1bad37031c5d57f51b04c8ea6e41805dcd2935ec
2011-01-18 15:39:34 -08:00
Dianne Hackborn
2ec5a7160b am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
  Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
2011-01-18 15:32:44 -08:00
Dianne Hackborn
36c84403ec Merge "Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog" into honeycomb 2011-01-18 15:31:21 -08:00
Dianne Hackborn
cfaf8878de Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
2011-01-18 15:28:41 -08:00
Brad Fitzpatrick
7adf848183 am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
* commit 'b4f655d5912869078cb7be29d108ebfea06019fc':
  StrictMode class instance limit interface.
2011-01-18 13:13:07 -08:00
Brad Fitzpatrick
b4f655d591 Merge "StrictMode class instance limit interface." into honeycomb 2011-01-18 13:11:33 -08:00
Brad Fitzpatrick
758035757f StrictMode class instance limit interface.
Change-Id: Ic5eea539586e5d4965d83364bf9f623d1d89f2b1
2011-01-18 11:38:37 -08:00
Martijn Coenen
3d06b1e0e9 am a701cf85: Implement IsoDep timeout handling (API).
* commit 'a701cf85a0167a6bb623343388a7dca6f2b61ac5':
  Implement IsoDep timeout handling (API).
2011-01-18 11:38:28 -08:00
Martijn Coenen
a701cf85a0 Implement IsoDep timeout handling (API).
Added a method for setting the timeout on IsoDep transactions.

Change-Id: Ie627e7a826556e46295fefe69b9be83ebf911d93
2011-01-18 11:35:46 -08:00
Jeff Hamilton
97ac293507 am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread
* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
  Javadoc updates for NFC.
2011-01-18 11:26:39 -08:00
Jeff Hamilton
8c1cd157fb am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread
* commit '3a223404e7589831a901cb16c5ce97685bc1f3f8':
  New APIs for NDEF Push Protocol.
2011-01-18 11:26:22 -08:00
John Reck
3977afe416 am d00207ff: Merge "WebStorage public API change" into honeycomb
* commit 'd00207ff87fa3e2d5430ea5c0980041c44738efe':
  WebStorage public API change
2011-01-18 11:18:59 -08:00
Dmitri Plotnikov
b92d08a738 am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb
* commit '48395385039a0c845bba8913c8d0c76981425aa4':
  Hiding the AsyncTaskLoader.waitForLoader method
2011-01-18 11:18:37 -08:00
John Reck
d00207ff87 Merge "WebStorage public API change" into honeycomb 2011-01-18 11:10:26 -08:00
Jeff Hamilton
0716ea144d Merge "Javadoc updates for NFC." into gingerbread 2011-01-18 11:01:55 -08:00
Jeff Hamilton
3a223404e7 Merge "New APIs for NDEF Push Protocol." into gingerbread 2011-01-18 11:01:05 -08:00
Jeff Hamilton
ce3224cda5 Javadoc updates for NFC.
Change-Id: Ibd91829979576297599fbcc9eb8054924af1d527
2011-01-18 10:57:30 -08:00