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

41775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason parks
ca615748cf am a55e3670: am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb 
* commit 'a55e367027fcd37aae83bf3e61225c45db0cf1cf':
  Add and enforce the permission for encrypting/decrypting.
 2011-01-21 12:39:55 -08:00
Jason parks
18e9cf0faa am bee8a768: am 0f2ef34b: Merge "Update encryption commands." into honeycomb 
* commit 'bee8a7686d380a7dc696756699411696d7685551':
  Update encryption commands.
 2011-01-21 12:39:49 -08:00
Jason parks
a55e367027 am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb 
* commit '0512d080a5ae7eccb154be4302aaf4b5fb8aa5a6':
  Add and enforce the permission for encrypting/decrypting.
 2011-01-21 12:36:20 -08:00
Jason parks
bee8a7686d am 0f2ef34b: Merge "Update encryption commands." into honeycomb 
* commit '0f2ef34b5a7158ab105edfb0d6c5904ae23e89fa':
  Update encryption commands.
 2011-01-21 12:36:01 -08:00
Robert Greenwalt
a9a4f5cc88 Merge "Switch from NetworkUtils to netd for iface config." 2011-01-21 12:06:16 -08:00
Jason parks
0512d080a5 Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb 2011-01-21 11:59:15 -08:00
Jason parks
0f2ef34b5a Merge "Update encryption commands." into honeycomb 2011-01-21 11:39:15 -08:00
Gilles Debunne
7bc7e36818 am 34aa51b8: am 4569f1a5: Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb 
* commit '34aa51b8f97cce5c49516ffecee2d620f02bcdd9':
  Paste popup window is displayed on the side when it would be clipped on top of screen.
 2011-01-21 11:36:47 -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
4569f1a561 Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb 2011-01-21 11:29:39 -08:00
Shimeng (Simon) Wang
765b2e2db4 am a2d32f3c: am 7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb 
* commit 'a2d32f3c48283d3c9c7d8e25704de86e26bc62f6':
  Keep min/max zoom scale in proportion when zoom density changes.
 2011-01-21 11:03:18 -08:00
Andy Stadler
568d9b6119 am 174a6fce: am c2ff2ec0: Merge "Read actual device encryption status" into honeycomb 
* commit '174a6fce8ab1a08b85e45f636dc2682f6a62e8d1':
  Read actual device encryption status
 2011-01-21 11:02:57 -08:00
Mathias Agopian
a60a05165f am 90b1207b: am 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread 
* commit '90b1207b6c5fdff4ea1504a7f84b81ed0ab4daa2':
  Fix the ISurfaceComposer onTransact switch.
 2011-01-21 11:02:45 -08:00
Nick Pelly
0967c1cbc5 am 11ce84fc: resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp 
* commit '11ce84fcaadb7051735dd50a35f6e6c234fbe480':
  Javadoc updates for NFC.
 2011-01-21 11:02:35 -08:00
Nick Pelly
d42cdbe6f7 am df80645a: Merge "resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp 
* commit 'df80645a97d994f20a9fba1311a884bf17d2b774':
  New APIs for NDEF Push Protocol.
 2011-01-21 11:02:16 -08:00
Justin Ho
3500cf744a am 864df044: am 50065738: Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb 
* commit '864df0444254823de71ef86a59d5abce107e1453':
  Integrating btn_dialog assets from Gingerbread
 2011-01-21 11:02:12 -08:00
Amith Yamasani
c7ba5785e2 am 04e5dcdd: am 672f4ef3: Merge "Sync activity picker to latest dialog style." into honeycomb 
* commit '04e5dcdd64b60f4069418dd909fb112b4927449a':
  Sync activity picker to latest dialog style.
 2011-01-21 11:02:05 -08:00
Justin Ho
430221f342 am 1fc1a381: am 09358f00: Integrating Gingerbread phone lockscreen assets 
* commit '1fc1a381e6a829777d63834721cb2e5e2945ae8b':
  Integrating Gingerbread phone lockscreen assets
 2011-01-21 11:02:00 -08:00
Justin Ho
5fd64beab3 am 58a4636f: am 6d495a67: Resized btn_radio buttons from Gingerbread for legacy apps 
* commit '58a4636f53026f27d2551bc596c07b85db93016d':
  Resized btn_radio buttons from Gingerbread for legacy apps
 2011-01-21 11:01:43 -08:00
satok
90a09e0546 am 026de9ed: am 6a0d924e: Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb 
* commit '026de9ed7f39c46260e7ac79dea2fcc32b151d19':
  Show implicitly enabled subtypes in the input method selection dialog
 2011-01-21 11:01:29 -08:00
Santosh Madhava
78e1a01479 am 10fcc6f5: am ff23e4d7: Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb 
* commit '10fcc6f500140886d3dd9b1684c85dd2eb35061a':
  Fix for issue 3370052 : Export progress percentage is incorrect
 2011-01-21 11:01:06 -08:00
Santosh Madhava
d61fba526e am f82856f3: am 95788cf4: Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb 
* commit 'f82856f3d206e3f3f2ef6c72d40538209e0eb659':
  Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
 2011-01-21 11:01:01 -08:00
Shih-wei Liao
4bef1f55b9 am 602aec6b: am f1f71053: Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb 
* commit '602aec6b5e16621fa0efc26bf328bcb3c43a28fa':
  Handle fatal errors from calling bccRegisterSymbolCallback (if any).
 2011-01-21 11:00:52 -08:00
Ken Wakasa
ed19b88fe2 am 6ddec8be: am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb 
* commit '6ddec8be1cc23f4b7e8793503420072024884072':
  Update class doc for InputMethodSubtype
 2011-01-21 11:00:46 -08:00
Brad Fitzpatrick
6700447200 am ca87f0e8: am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb 
* commit 'ca87f0e832f71226839004c8e854e1389c037234':
  StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
 2011-01-21 11:00:20 -08:00
satok
6a32272af5 am d57c1fcf: am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb 
* commit 'd57c1fcf5a4f8fd9451e4a09aa50ed14c7f94ff2':
  Show ime switch icon when there is a hard keyboard
 2011-01-21 10:59:32 -08:00
Adam Cohen
047106d436 am f95a963e: am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb 
* commit 'f95a963e7313b209ab3da5eeac1bde385bca4355':
  Cleaning up some StackView bad behavior
 2011-01-21 10:59:20 -08:00
Romain Guy
d0417fa04e am 8e2d489a: am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb 
* commit '8e2d489a868d52a979eed91a13a7605630ac997c':
  Add support for drawBitmapMesh().
 2011-01-21 10:59:07 -08:00
Jim Miller
252d95086a am be71a923: am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb 
* commit 'be71a923b084accde4c2b3ff74b2454bc6894eb6':
  Fix 3374446: Allow multiple shift keys in Keyboard.
 2011-01-21 10:58:58 -08:00
Adam Powell
57cb1b8f4f am b6b47116: am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb 
* commit 'b6b4711648d83cccebe52142c4efefaa67f4dc65':
  SearchView API Review - bug 3370353 and bug 3370338
 2011-01-21 10:58:45 -08:00
Scott Main
d368a35c44 am 535ad65e: am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits 
* commit '535ad65e543d724d177fb8e8175e120d571d804b':
  cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
 2011-01-21 10:58:30 -08:00
Scott Main
aa99dc6543 am 244c10b0: am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was n 
* commit '244c10b0d879d9373a1ad4b80ae71d5a35c762ba':
  cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
 2011-01-21 10:58:22 -08:00
Robert Ly
dab49a65fa am 16c0a0f6: am edc2aac7: cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview 
* commit '16c0a0f638b845ce4f24b6124154a00707676819':
  cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
 2011-01-21 10:58:13 -08:00
Stephen Hines
ee2399273b am 536f525d: am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb 
* commit '536f525ddb96cf751eccbd787189f34738e21a05':
  Properly use Long2 for "UInt2" for FieldPacker.
 2011-01-21 10:56:57 -08:00
Scott Main
91d94ea513 am 0cf6d22a: am 924e3528: Merge "docs: add getting started doc and version notes for HC preview" into honeycomb 
* commit '0cf6d22a679aecf2d4dc589eaa7ba1e0635edfe0':
  docs: add getting started doc and version notes for HC preview
 2011-01-21 10:56:36 -08:00
Andreas Huber
701dc75442 am ec0c94b7: am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb 
* commit 'ec0c94b7d70c1e4160e1ec57070b94d052de7eb5':
  Implement missing pause/resume support for NuPlayer.
 2011-01-21 10:48:25 -08:00
Scott Main
d7bfa435f5 am 437bf22d: am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb 
* commit '437bf22d0f177eea06a0ab8fe9e51ebe5f9bef11':
  docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
 2011-01-21 10:48:16 -08:00
Dianne Hackborn
91478bbb00 am d79b8b17: am 27044f1d: Merge "Fix issue #3352125: Crash after clearing search query" into honeycomb 
* commit 'd79b8b173c39d7a556c6c49b42c11f7c0f56172b':
  Fix issue #3352125: Crash after clearing search query
 2011-01-21 10:48:03 -08:00
Shimeng (Simon) Wang
a2d32f3c48 am 7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb 
* commit '7633540cf0d1cfa1f893dc827cddaca3ea272af7':
  Keep min/max zoom scale in proportion when zoom density changes.
 2011-01-21 10:47:35 -08:00
Shimeng (Simon) Wang
7633540cf0 Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb 2011-01-21 10:45:22 -08:00
Robert Greenwalt
27d3c5907c Switch from NetworkUtils to netd for iface config. 
Moving more stuff to netd and getting rid of unused NetworkUtils.

Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
 2011-01-21 10:44:12 -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
Andy Stadler
174a6fce8a am c2ff2ec0: Merge "Read actual device encryption status" into honeycomb 
* commit 'c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c':
  Read actual device encryption status
 2011-01-21 10:30:03 -08:00
Andy Stadler
c2ff2ec0d9 Merge "Read actual device encryption status" into honeycomb 2011-01-21 10:27:46 -08:00
Mathias Agopian
90b1207b6c am 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread 
* commit '4707dc73e236b7055644401b73cd30164b7ad157':
  Fix the ISurfaceComposer onTransact switch.
 2011-01-21 10:15:34 -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
df80645a97 Merge "resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp 2011-01-21 09:29:13 -08:00
Justin Ho
864df04442 am 50065738: Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb 
* commit '500657387d834a8eb712e9c56bb00b64173cc1a9':
  Integrating btn_dialog assets from Gingerbread
 2011-01-21 09:20:42 -08:00
Justin Ho
500657387d Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb 2011-01-21 09:18:17 -08:00
Justin Ho
8c4e928858 Integrating btn_dialog assets from Gingerbread 
Change-Id: Ibcd80e649e666b611f6b5b23dfcdd5818f619131
 2011-01-21 09:17:20 -08:00