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

17888 Commits

Author SHA1 Message Date
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
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
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
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
Jason parks
0512d080a5 Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb 2011-01-21 11:59: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
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
satok
0e5bf5051b Merge "Show ime switch icon when there is a hard keyboard" into honeycomb 2011-01-20 19:47:43 -08:00
Adam Cohen
cdd5626da6 Merge "Cleaning up some StackView bad behavior" into honeycomb 2011-01-20 19:42:23 -08:00
satok
865b97761c Show ime switch icon when there is a hard keyboard 
Change-Id: Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0
 2011-01-21 12:28:01 +09:00
Romain Guy
99d49118b8 Merge "Add support for drawBitmapMesh()." into honeycomb 2011-01-20 19:07:28 -08:00
Romain Guy
5a7b466a2b Add support for drawBitmapMesh(). 
Change-Id: Ic77f9c534bb90dc7b9458299544bd50b8b6ae6a5
 2011-01-20 19:09:30 -08:00
Jim Miller
055e56ee1b Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb 2011-01-20 18:51:12 -08:00
Adam Powell
9a161b0981 Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb 2011-01-20 18:44:32 -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
Jim Miller
6465f77537 Fix 3374446: Allow multiple shift keys in Keyboard. 
This fixes a bug introduced in 3c6dd8f9 because we now
have two shift keys. The code now tracks a global state
and looks for up to two shift keys.

Update after review and added code to handle extra
invalidate required by additional shift key.

Change-Id: Ic1728dd0ceec089089cd1beca1b0b30565d6e658
 2011-01-20 18:20:12 -08:00
Shimeng (Simon) Wang
66064914fc Keep min/max zoom scale in proportion when zoom density changes. 
issue: 3341610
Change-Id: Ibf87ab499e28fddab81d4e354ec7d88f5eb86261
 2011-01-20 17:45:34 -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
Scott Main
437bf22d0f am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb 
* commit 'cfaa9c152cf7fbdf13b41876422fdfe9bffa3c2a':
  docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
 2011-01-20 17:14:55 -08:00
Dianne Hackborn
d79b8b173c am 27044f1d: Merge "Fix issue #3352125: Crash after clearing search query" into honeycomb 
* commit '27044f1d4c5765388a745527b220a3a574c4f834':
  Fix issue #3352125: Crash after clearing search query
 2011-01-20 17:14:41 -08:00
Brad Fitzpatrick
7204528e71 am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb 
* commit '9358bd39dc8829ef8413294da70d44cd928ca878':
  Fixes for StrictMode instance count checking.
 2011-01-20 17:07:41 -08:00