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

18137 Commits

Author SHA1 Message Date
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
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
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
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
Dianne Hackborn
4eba96bb31 Fix issue #3377999: Activities need to be stopped when sleeping 
This is a band-aid over the existing kludgy stopping mechanism
where the semantics of stop are different in the activity manager
than in the clients.

This change is intended to be as unobtrusive as possible, only
impacting the sleep case.  I have a different change that
completely reworks how we stop activities to simply this all
a lot by unifying the semantics between the server and client.
However, it is too late in HC for such an extensive change.  Later
I'll revert this one and put in the better solution.

Change-Id: Id77f2db1ec83469cdd888acb8fbc4679daa7766e
 2011-01-21 13:42:26 -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
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
Jeff Hamilton
446aea40eb API changes for NFC. 
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
 2011-01-21 12:33:49 -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
Jean-Michel Trivi
3ebade5d42 am a314f32b: Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread 
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
  Bug 3365937 notify TTS initialization listener of binding errors
 2011-01-21 09:15:02 -08:00
Jean-Michel Trivi
a314f32ba9 Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread 2011-01-21 09:09:30 -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