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

19372 Commits

Author SHA1 Message Date
Joe Onorato
60d9d9cdba am 75057b15: am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '75057b1507881625368f76b2f401097b606bd530':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:09:29 -08:00
Joe Onorato
75057b1507 am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 
* commit '4de68baed4bf18b33dc38f89f25410d3d5edfecf':
  Check for the STATUS_BAR permission for the system UI properties.
 2011-01-30 16:03:59 -08:00
Dianne Hackborn
54ad361194 Merge "Fix issue #3404571: Commit final APIs" into honeycomb 2011-01-30 16:01:36 -08:00
Joe Onorato
4de68baed4 Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 2011-01-30 16:00:52 -08:00
Gilles Debunne
b51ef3c5a1 am 80a3083f: am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '80a3083fdd106b2f839d50e1c861347faa969781':
  Auto-clearing setError popup
 2011-01-30 15:56:41 -08:00
Gilles Debunne
80a3083fdd am 236b9872: Merge "Auto-clearing setError popup" into honeycomb 
* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup
 2011-01-30 15:53:03 -08:00
Gilles Debunne
236b987214 Merge "Auto-clearing setError popup" into honeycomb 2011-01-30 15:49:38 -08:00
Adam Powell
65a1de963a Fix bug 3405899 - android.view.WindowManager$BadTokenException 
Clear any pending runnables involved with TextViews when cursor
controllers are released

Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
 2011-01-30 15:47:29 -08:00
Joe Onorato
ac0ee89bd9 Check for the STATUS_BAR permission for the system UI properties. 
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.

Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
 2011-01-30 15:38:30 -08:00
Vasu Nori
4b91b4b117 Merge "bug:3385018 don't print finalizer warnings under certain conditions" 2011-01-30 14:45:40 -08:00
Vasu Nori
83ff97d840 bug:3385018 don't print finalizer warnings under certain conditions 
Change-Id: I06c49a464f61c26d3e6645a95f2dd38d444bf384
 2011-01-30 14:42:36 -08:00
Dianne Hackborn
3b024a6d28 Fix issue #3404571: Commit final APIs 
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
 2011-01-30 14:26:31 -08:00
Jeff Brown
46bfd4a355 resolved conflicts for merge of c608e106 to master 
Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8
 2011-01-30 12:50:09 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge 
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
 2011-01-30 12:40:38 -08:00
Gilles Debunne
12ab64593f Auto-clearing setError popup 
Bug 3403325

Error popup has to be dismissed whether or not the key was handled.

Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
 2011-01-30 12:11:24 -08:00
Jeff Brown
c608e106a6 am 3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 
* commit '3c89f6d1bd0821d0ae0205a5b48176156735aaac':
  Add "Use physical keyboard" option to system bar IME button.
 2011-01-30 12:10:07 -08:00
Jeff Brown
3c89f6d1bd Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 2011-01-30 12:07:49 -08:00
Joe Malin
69aedbedfe am f5002922: am 51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 
* commit 'f50029220664be6cc5b2b4c18377b0efa9fe6ca5':
  sdk doc change: Copy/Paste/Drag/Drop
 2011-01-30 09:55:50 -08:00
Joe Malin
f500292206 am 51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 
* commit '51990f9b0c7c0a22e1a3440c620ab97ebe4209c9':
  sdk doc change: Copy/Paste/Drag/Drop
 2011-01-30 09:48:49 -08:00
Joe Malin
51990f9b0c Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 2011-01-30 09:45:59 -08:00
Ken Wakasa
428dbe0181 am 4e3f3a20: am 8710e76a: Follow up change to I741642ac 
* commit '4e3f3a2046a5743f02ebca665b771467ad900ce1':
  Follow up change to I741642ac
 2011-01-29 21:46:22 -08:00
Ken Wakasa
4e3f3a2046 am 8710e76a: Follow up change to I741642ac 
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
  Follow up change to I741642ac
 2011-01-29 21:42:30 -08:00
Ken Wakasa
8710e76a89 Follow up change to I741642ac 
Fix wrong constant.

bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
 2011-01-30 11:02:09 +09:00
Jean-Baptiste Queru
d2ed82fb94 am 66700397: Merge 3100207b from gingerbread-plus-aosp 
* commit '66700397496fc6f6d26f9f0b56ead8ef610b9654':
  Tweak to make merges easier
 2011-01-29 14:54:43 -08:00
Jean-Baptiste Queru
6670039749 Merge 3100207b from gingerbread-plus-aosp 
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
 2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
3100207be5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Jean-Baptiste Queru
8f4a04f04c am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread 
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
 2011-01-29 12:59:20 -08:00
Jean-Baptiste Queru
1358b6a4fb Tweak to make merges easier 
Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
 2011-01-29 12:54:09 -08:00
Jason parks
450536b6a6 am d4796c82: am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'd4796c823b92866d5895acf610e5571e9b5724d9':
  Update the encryption password when the device password is changed.
 2011-01-29 12:06:39 -08:00
Jason parks
d4796c823b am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
  Update the encryption password when the device password is changed.
 2011-01-29 12:04:11 -08:00
Jason parks
a2e765ef1a Merge "Update the encryption password when the device password is changed." into honeycomb 2011-01-29 12:02:19 -08:00
Jean-Baptiste Queru
0044b4ad6a Merge d350dc04 from gingerbread 
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
 2011-01-29 10:57:48 -08:00
Nick Pelly
4226be3f04 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-29 10:40:07 -08:00
Jean-Baptiste Queru
0440cc1fb7 Merge eab0e97b from gingerbread 
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
 2011-01-29 10:38:09 -08:00
Dianne Hackborn
1ac4f38dfa am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
 2011-01-29 09:54:53 -08:00
Kenny Root
c68a657f12 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
962d556a12 Merge f126ad3b from gingerbread 
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
 2011-01-29 09:37:44 -08:00
Robert Greenwalt
b46062bc08 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.
 2011-01-29 09:35:28 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Nick Pelly
1ac6d08a05 am b134223f: Make Mifare Classic increment/decrement operands little endian 
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
 2011-01-29 09:31:56 -08:00
Jean-Baptiste Queru
52d3320815 am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp 
* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
  API: Make close() throw an IOException.
 2011-01-29 08:50:38 -08:00
Jean-Baptiste Queru
bf9f3ea72e Merge 34afc2cd from gingerbread-plus-aosp 
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
 2011-01-29 08:45:29 -08:00
Nick Pelly
e7662123f2 am 7a69ffa0: am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '7a69ffa0e455cfb990b53d9dffa3b76c590dea0e':
  Fix build - javadoc.
 2011-01-29 08:35:53 -08:00
Nick Pelly
7a69ffa0e4 am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
  Fix build - javadoc.
 2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
8b10bdb494 am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aosp 
* commit '7d4b7dab397fb780873303d60650bf0a0557cf41':
  Clean up MifareUltralight API.
 2011-01-29 07:38:41 -08:00
Jean-Baptiste Queru
7d4b7dab39 Merge 55e124c4 from gingerbread-plus-aosp 
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
 2011-01-29 07:32:39 -08:00
Arnaud Ferir
c5e35fd246 am 5e81a6e2: Fix trace mismatch. 
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
 2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
addd46c658 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. 
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
 2011-01-29 07:29:56 -08:00
Jean-Baptiste Queru
86e1c5b9f6 Merge c896d85c from gingerbread 
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
 2011-01-29 07:27:06 -08:00