drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,357 Commits 1 Branch 0 Tags
Commit Graph

2488 Commits

Author SHA1 Message Date
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
1bc9e6cbb1 am 8bbec794: am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb 
* commit '8bbec794473f802d4d61613f77bc69a582e3fcc0':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
 2011-01-20 17:25:55 -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
f27e6d5d78 am f008667e: am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 
* commit 'f008667e6d6dc62f36b46c35ebe41b7592b3931c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
 2011-01-20 11:06:40 -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
f41e1af8c0 am 7fff9d8e: am 586f0513: Refine InputMethodInfo API 
* commit '7fff9d8e0489455363eb2d70111b7164adab46ff':
  Refine InputMethodInfo API
 2011-01-20 08:16:05 -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
d738d87e13 am b1ba4367: am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb 
* commit 'b1ba4367b6ef046ec137345932318265f210a205':
  Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
 2011-01-20 07:41:12 -08: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
2ee0635d46 am 6c51e1fc: am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 
* commit '6c51e1fc9dd61bf5c269590305b3276f9e38c1ef':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
 2011-01-20 05:21:18 -08: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
8f700e9488 am 695976ab: am 0e2de6d7: Addressing API Review docs bugs: 
* commit '695976ab8e05adf59743937e08a17bc59af4bcd6':
  Addressing API Review docs bugs:
 2011-01-20 00:12:37 -08: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
3386caa38c am ce06e78d: am a6abd062: previewImage API shouldn\'t be hidden. 
* commit 'ce06e78db1280a91f3bba1cf5ca7a2cfbbf49492':
  previewImage API shouldn't be hidden.
 2011-01-19 21:47:47 -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
c0d4062965 am e200420e: am d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb 
* commit 'e200420e168ae135f6e87ee3a1abd44c971a1fe4':
  Rename KeyCharacterMap.UnavailableException.
 2011-01-19 18:00:50 -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
e9543c00ef am 39b38919: am 9dd9d021: Merge "Expose unchecked copyFrom variants." into honeycomb 
* commit '39b38919c208983015eb3580ce8e1a846d7dd00e':
  Expose unchecked copyFrom variants.
 2011-01-19 16:31:10 -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
983b319a8a am 3c1f64c4: am 62097ad6: Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb 
* commit '3c1f64c4ad8fa9d81bdbeb0b505730bf5003916f':
  @hide MediaStore.ACTION_MTP_SESSION_END
 2011-01-19 16:14:16 -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
28d5206519 am bd80a12c: resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp 
* commit 'bd80a12cba480a0dbb2e9073f35c758d8b396b94':
  StrictMode: class instance limits (track object "leaks")
 2011-01-19 15:24:02 -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
9df9ee7491 am 1ebd8c11: am 4243dc39: Updated the Time/Date pickers to be backwards compatible 
* commit '1ebd8c11f73625050035b4fca35841a9e30bca04':
  Updated the Time/Date pickers to be backwards compatible
 2011-01-19 12:39:56 -08:00