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

18267 Commits

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
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
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
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
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
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
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
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
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
Amith Yamasani
04e5dcdd64 am 672f4ef3: Merge "Sync activity picker to latest dialog style." into honeycomb 
* commit '672f4ef34801ddc788b2fe4ca41da58147ba1234':
  Sync activity picker to latest dialog style.
 2011-01-21 08:45:09 -08:00
Justin Ho
1fc1a381e6 am 09358f00: Integrating Gingerbread phone lockscreen assets 
* commit '09358f00fd87cd5a9fc143a0376c228f11881fa1':
  Integrating Gingerbread phone lockscreen assets
 2011-01-21 08:43:08 -08:00
Amith Yamasani
672f4ef348 Merge "Sync activity picker to latest dialog style." into honeycomb 2011-01-21 08:42:18 -08:00
Justin Ho
09358f00fd Integrating Gingerbread phone lockscreen assets 
Change-Id: Id13942e4e516b3744d89521898c55566fd39fc35
 2011-01-21 08:40:14 -08:00
Justin Ho
58a4636f53 am 6d495a67: Resized btn_radio buttons from Gingerbread for legacy apps 
* commit '6d495a67fcf52b3c2d99443ca25e4df6bceaf07a':
  Resized btn_radio buttons from Gingerbread for legacy apps
 2011-01-21 07:45:43 -08:00
Justin Ho
6d495a67fc Resized btn_radio buttons from Gingerbread for legacy apps 
Change-Id: I1d2bef3e08e48c4a36c8311c076bdbe9fa0b3725
 2011-01-21 07:40:49 -08:00
Ken Wakasa
6ddec8be1c am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb 
* commit 'ccbdf5e838eb44a1920c2c02fcf4190880a3c540':
  Update class doc for InputMethodSubtype
 2011-01-20 23:09:34 -08:00
Ken Wakasa
ccbdf5e838 Merge "Update class doc for InputMethodSubtype" into honeycomb 2011-01-20 23:07:53 -08:00
Ken Wakasa
e31e942455 Update class doc for InputMethodSubtype 
bug: 3370290
Change-Id: Ib86f81c1a5f6c9acca34b586d810c6e94db1b552
 2011-01-21 15:57:37 +09:00
Brad Fitzpatrick
ca87f0e832 am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb 
* commit '6828656220f4ed5ae803e4c11fb75fb56bc3ea25':
  StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
 2011-01-20 22:26:50 -08:00
Brad Fitzpatrick
6828656220 Merge "StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties" into honeycomb 2011-01-20 22:24:18 -08:00
Jason parks
8888c597c4 Add and enforce the permission for encrypting/decrypting. 
Change-Id: Ia292d8a5981266c2703743beb79fd786d77b375d
 2011-01-21 00:07:49 -06:00
satok
d57c1fcf5a am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb 
* commit '0e5bf5051b02bc382fb7e6c975511af499b31624':
  Show ime switch icon when there is a hard keyboard
 2011-01-20 21:44:59 -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
Romain Guy
8e2d489a86 am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb 
* commit '99d49118b857df4051a864b35254e275bc8a68b6':
  Add support for drawBitmapMesh().
 2011-01-20 21:42:40 -08:00
Jim Miller
be71a923b0 am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb 
* commit '055e56ee1bf62d9dc97ba3b483c79312e2bb2beb':
  Fix 3374446: Allow multiple shift keys in Keyboard.
 2011-01-20 21:42:36 -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