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

40987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martijn Coenen
ed0c705f3e am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly(). 
* commit 'c4eee776ad9d3de99032984fe20f5de395888bc7':
  Check NDEF before calling makeReadOnly().
 2011-01-21 14:36:33 -08:00
Nick Pelly
ed8bb922c2 Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-21 14:34:03 -08:00
Leon Scroggins
12871245c7 am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb 
* commit '6013013829d1f97970d3ed426006d2522303826f':
  Restart input when the webpage changes the text.
 2011-01-21 14:33:03 -08:00
Jason Sams
0629ac78fc am 8418474d: Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb 
* commit '8418474dab412596c44c71497c0f4a3c39de597e':
  fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking.
 2011-01-21 14:30:56 -08:00
Leon Scroggins
6013013829 Merge "Restart input when the webpage changes the text." into honeycomb 2011-01-21 14:30:50 -08:00
Jason Sams
8418474dab Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb 2011-01-21 14:28:55 -08:00
Yu Shan Emily Lau
58fc2d39e8 am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb 
* commit '588b1e4511d67f080449c3d49fd0d4bfc2bec79f':
  Change the default ssid from GoogleGuest to the opennet for the power test.
 2011-01-21 14:28:52 -08:00
Yu Shan Emily Lau
588b1e4511 Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb 2011-01-21 14:27:06 -08:00
Leon Scroggins
a51063c059 Restart input when the webpage changes the text. 
Bug:3375518
Change-Id: I0a18d0ca764ce428d86bd5f6d13f8764668acea6
 2011-01-21 17:14:36 -05:00
Yu Shan Emily Lau
3d273da8fa Change the default ssid from GoogleGuest to the opennet for the power test. 
Change-Id: I63bae360d283dc5224790aaccbd879015402187d
 2011-01-21 14:06:22 -08:00
Nick Pelly
8bb36dbbf3 resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp 
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
 2011-01-21 14:01:54 -08:00
Romain Guy
11ad95c49b am d8b9d7cd: Merge "Don\'t set a Toast\'s view to null when enqueued several times. Bug #3374386" into honeycomb 
* commit 'd8b9d7cd1b2327b02e41edcddf94e64d481419d1':
  Don't set a Toast's view to null when enqueued several times. Bug #3374386
 2011-01-21 13:25:02 -08:00
Romain Guy
d8b9d7cd1b Merge "Don't set a Toast's view to null when enqueued several times. Bug #3374386" into honeycomb 2011-01-21 13:23:25 -08:00
Andreas Huber
9a62d902ea am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb 
* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8':
  Some tweaks to HTTP live / nuplayer behaviour
 2011-01-21 13:17:42 -08:00
Patrick Dubroy
338ebe1492 am 40c37043: Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb 
* commit '40c37043367f7cefd3467c41c57ec7be169b681f':
  Update Bitmap.recycle() doc for heap-allocated pixel data
 2011-01-21 13:15:37 -08:00
Andreas Huber
05aa082770 Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb 2011-01-21 13:14:30 -08:00
Patrick Dubroy
40c3704336 Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb 2011-01-21 13:13:17 -08:00
Jason Sams
ed5bab93c6 fix bug 3375251 
Copying arrays of objects would generate an exception
due to excessive internal type checking.

Change-Id: Ic89c24962408f1a95dc0385b74618a70d6ff5859
 2011-01-21 13:08:02 -08:00
Huahui Wu
48c4199ee6 am 17d25c56: Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb 
* commit '17d25c564da50cfdcef6705ccc592ced2bd7c960':
  b/3369602 Using Math.round() to convert float coordinates to integers.
 2011-01-21 13:05:24 -08:00
Huahui Wu
17d25c564d Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb 2011-01-21 13:03:49 -08:00
Leon Scroggins
62fd9903a7 am d5188657: Do a better job of lining up text with page text. 
* commit 'd5188657dcde0f40a6954a00d569c0575bf6095a':
  Do a better job of lining up text with page text.
 2011-01-21 12:59:05 -08:00
Leon Scroggins
d5188657dc Do a better job of lining up text with page text. 
Bug:3085564
Bug:3196224
Bug:3321608

Remove Touch.getMaxScrollX(), which is incorrect for my
purpose, and is not used anywhere else.  Instead use the
layout to determine the maximum horizontal scroll of a
textfield.

Now that textareas use layers, scroll the layer's picture
in the UI thread for vertical movement.  When passing a
click to webcore, also pass a message to scroll the actual
textarea so the click will be in the correct place.

Lastly, do not override bringPointIntoView, which allows
moving the insertion handler beyond the edge of a field to
scroll it.  Instead, override requestRectangleOnScreen to
do nothing, since my actual goal is to prevent the TextView
from changing the scroll of the WebView, which is done by
webkit.

Requires a change to external/webkit.

Change-Id: Ib91907599b792287c373d3678cb04e0cb5e34471
 2011-01-21 15:42:03 -05:00
Jesse Wilson
b5fe803ff5 am 276677f2: Merge "Move URLTest tests to libcore." into honeycomb 
* commit '276677f2ac821e5eb8a7f6a4204242ee47501d6e':
  Move URLTest tests to libcore.
 2011-01-21 12:36:24 -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
Romain Guy
2152ca58c2 Don't set a Toast's view to null when enqueued several times. 
Bug #3374386

Change-Id: I0fc6f96b37c8866ad1e890813054dafbaf2cc13e
 2011-01-21 12:31:53 -08:00
Jesse Wilson
276677f2ac Merge "Move URLTest tests to libcore." into honeycomb 2011-01-21 12:13:11 -08:00
Patrick Dubroy
a383b3f646 Update Bitmap.recycle() doc for heap-allocated pixel data 2011-01-21 12:08:51 -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
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
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
Jesse Wilson
f3efdf5013 Move URLTest tests to libcore. 
These tests were migrated to libcore in change ID I5a6bcdf1c03d0c36b11552ae086d0dece0440f64.

Change-Id: Idc2d8fc3681b77c9a4c19a192a202bc556a48d23
 2011-01-21 10:37:19 -08:00
Huahui Wu
a586b7baaf b/3369602 Using Math.round() to convert float coordinates to integers. 
Change-Id: If4da01046c909667ce57a849569ae6b1acefb939
 2011-01-21 10:37:09 -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
Andreas Huber
19922adceb Some tweaks to HTTP live / nuplayer behaviour 
- play audio-only streams again
- workaround for malformed streams that switch PIDs across bandwidths
- attempt to pick a different bandwidth stream if the previously chosen one appears
  to be malformed/unsupported.

Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9
related-to-bug: 2368598
 2011-01-21 10:34:40 -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
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