Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,080 Commits 3 Branches 0 Tags
6752e6747952fbc545e088aceaba9db131c19f94
Commit Graph

14572 Commits

Author SHA1 Message Date
Nick Pelly
5cfbda1542 resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp 
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
 2011-01-21 15:30:32 -08:00
Adam Powell
a4f8e903c3 am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb 
* commit '5fc3c84f5c465d3f0f435037bd5b92fa8da1f2c2':
  Fix bug 3362680 - calendar crash while tabbing among views
 2011-01-21 15:52:12 -08:00
Nick Pelly
c971d5ed8e am 82160444: am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread 
* commit '8216044435d066a6279d1a733b919156bdc9325f':
  Support for TagLostException (API).
 2011-01-21 15:50:54 -08:00
Nick Pelly
274ee68d32 am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread 
* commit 'ccc9a9e58247d174d587dee465868a948a07364f':
  Fix javadoc which broke build.
 2011-01-21 15:50:20 -08:00
Adam Powell
5fc3c84f5c Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb 2011-01-21 15:49:46 -08:00
Jaikumar Ganesh
32064b6727 am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb 
* commit 'c4cc3ea48add3b7a63a1a97fc3a4c89b24217604':
  Temporary Changes for certification of SCO.
 2011-01-21 15:45:54 -08:00
Jaikumar Ganesh
c4cc3ea48a Merge "Temporary Changes for certification of SCO." into honeycomb 2011-01-21 15:43:42 -08:00
Adam Powell
3cb8b638c4 Fix bug 3362680 - calendar crash while tabbing among views 
Remove pending click callbacks when a view is detached from its
window.

Change-Id: I51de184b8e95dbd594675ea6849647586a7c4ba2
 2011-01-21 15:34:14 -08:00
Jaikumar Ganesh
75c2701454 Temporary Changes for certification of SCO. 
Bug: 3349475
Change-Id: I555b127a1d9218494cd05c07c9e9f29628f3bc74
 2011-01-21 15:17:23 -08:00
Nick Pelly
a4f26c3d03 am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread 
* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
  hange the default IsoDep timeout to 300ms (docs update).
 2011-01-21 15:03:19 -08:00
Mathias Agopian
80f3376b3a am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread 
* commit 'b92a40ebfaf49783f942b75b413e1499e149c3bb':
  fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
 2011-01-21 15:02:26 -08:00
Gilles Debunne
48617a5134 am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb 
* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
  Tapping inside an EditText should always pop up the IME.
 2011-01-21 14:55:50 -08:00
Gilles Debunne
b5e5b2d99b Merge "Tapping inside an EditText should always pop up the IME." into honeycomb 2011-01-21 14:53:44 -08:00
Amith Yamasani
610dff54fc am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb 
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
  Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
 2011-01-21 14:49:34 -08:00
Michael Kolb
b2b830774f am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb 
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
  Add public API for on screen zoom controls
 2011-01-21 14:49:30 -08:00
Amith Yamasani
b58b5db4ba Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb 2011-01-21 14:47:32 -08:00
Michael Kolb
debb5bbe81 Merge "Add public API for on screen zoom controls" into honeycomb 2011-01-21 14:47:30 -08:00
Brad Fitzpatrick
8a82de2fca am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager" 
* commit '4bb180d62f71658d04a7d6800707de83c10b01a5':
  frameworks/base: remove redundant code in WindowManager
 2011-01-21 14:36:43 -08:00
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
Leon Scroggins
6013013829 Merge "Restart input when the webpage changes the text." into honeycomb 2011-01-21 14:30:50 -08:00
Michael Kolb
5840cd294a Add public API for on screen zoom controls 
http://b/issue?id=3378224
    This is a simple unhide.
    Allow the use of WebView pinch-to-zoom gestures
    without the on screen zoom controls.
    Currently, enabling pinch to zoom with the public API also shows the
    on screen zoom buttons.
    If the zoom buttons are not wanted, a custom implementation of pinch to
    zoom is required, which can't be done correctly at this point.

Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
 2011-01-21 14:15:16 -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
Nick Pelly
8bb36dbbf3 resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp 
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
 2011-01-21 14:01:54 -08:00
Gilles Debunne
c3e85a712b Tapping inside an EditText should always pop up the IME. 
Bug 3374062

When the tap in slightly off the EditText, it receives focus from its parent layout
which dispatches the event. However, the touch event is (correctly) not propagated
in that case.

onFocusChanged should hence do actions similar to what is done on touch up events.

Change-Id: Ia5c04546674fc6239aa4d0b8d051f4951ca91352
 2011-01-21 13:35:29 -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
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
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
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
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
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