Gilles Debunne
9852ccde20
am a41bc338: Merge "Popup windows positions are updated when a TextView is scrolled"
...
* commit 'a41bc33855d9e55701c6e615590e273ada69a445':
Popup windows positions are updated when a TextView is scrolled
2011-09-02 13:28:00 -07:00
Gilles Debunne
a41bc33855
Merge "Popup windows positions are updated when a TextView is scrolled"
2011-09-02 13:24:20 -07:00
Gilles Debunne
6ee2490076
am f3d78eac: Merge "Added an add to dictionary option in suggestions for misspelled words"
...
* commit 'f3d78eac0f565b51d5e657e6cb21b4a48ef6f660':
Added an add to dictionary option in suggestions for misspelled words
2011-09-02 13:23:10 -07:00
Gilles Debunne
5ca26cb184
am 26b5cf40: Merge "Fixes around text selection"
...
* commit '26b5cf40b14a7916c9fee01d797b82d786338cf1':
Fixes around text selection
2011-09-02 13:23:06 -07:00
Gilles Debunne
cc96719625
am 1737fcd6: Merge "Fix for NPE in Switch"
...
* commit '1737fcd689072cabcb9937316ba159ee954f3536':
Fix for NPE in Switch
2011-09-02 13:23:02 -07:00
Gilles Debunne
f3d78eac0f
Merge "Added an add to dictionary option in suggestions for misspelled words"
2011-09-02 13:19:24 -07:00
Gilles Debunne
26b5cf40b1
Merge "Fixes around text selection"
2011-09-02 13:17:44 -07:00
Gilles Debunne
1737fcd689
Merge "Fix for NPE in Switch"
2011-09-02 13:17:13 -07:00
Chet Haase
185c8f05a0
am 016671fb: Merge "Tweaks to NotificationPanel animation"
...
* commit '016671fb46e247fbec2067ff9f9be417304ae0a2':
Tweaks to NotificationPanel animation
2011-09-02 13:15:27 -07:00
Chet Haase
016671fb46
Merge "Tweaks to NotificationPanel animation"
2011-09-02 13:14:18 -07:00
Russell Brenner
72efdc3c34
am d9facff5: Merge "Add Armenian and Georgian fonts"
...
* commit 'd9facff585b52630203836bf50b873e52a083c24':
Add Armenian and Georgian fonts
2011-09-02 12:53:58 -07:00
Martijn Coenen
84ba511cb7
am 0c8d57d1: Merge "Fix Activity ref-leak in NFC dispatch API."
...
* commit '0c8d57d124d917721890b0aa4a152f9c9c7d317f':
Fix Activity ref-leak in NFC dispatch API.
2011-09-02 12:52:03 -07:00
Russell Brenner
d9facff585
Merge "Add Armenian and Georgian fonts"
2011-09-02 12:51:22 -07:00
Martijn Coenen
0c8d57d124
Merge "Fix Activity ref-leak in NFC dispatch API."
2011-09-02 12:50:27 -07:00
Chet Haase
41bff38d30
Tweaks to NotificationPanel animation
...
The animation that runs when the NotificationPanel appears
used to start, then pause for a long time as the window/surface/layer
was created, then by the time it started to be visible, the animation
was over. This new approach delays starting the animation until the
layer has been drawn, so the animation can actually run a few frames after
that before finishing.
Change-Id: I998f01fd48cb762178021ad99e2b919b58a1ef3f
2011-09-02 11:28:25 -07:00
Gilles Debunne
70a6312f09
Fixes around text selection
...
Text selection mode was started by two consecutive taps inside a
field with selectAllOnFocus.
ArrowKeyMovementMethod does not respect the possible cancelLongPress and handles up events.
As a result a scroll that happens to end up at its initial position will be considered a tap
and will move the cursor.
This is however not considered as a tap in TextView and a possible selection mode would not
be stopped in that case.
Fixed by making ArrowKeyMovementMethod aware of the cancel that happened in Touch.
Change-Id: I07372b703f250e1edc7ee0665318ce30441b9187
2011-09-02 11:26:46 -07:00
Mangesh Ghiware
6ff9f9eff2
am 5afd2bd0: Merge "Set reading level scale to display density instead of a fixed minimum."
...
* commit '5afd2bd02ae44d5a38f9e560047723ddab176405':
Set reading level scale to display density instead of a fixed minimum.
2011-09-02 11:16:05 -07:00
Mangesh Ghiware
5afd2bd02a
Merge "Set reading level scale to display density instead of a fixed minimum."
2011-09-02 11:14:14 -07:00
Dianne Hackborn
3939356d41
am c592e8e6: Merge "Fix issue #4554429 : API REVIEW: deprecate Live Folders"
...
* commit 'c592e8e61acd3cfbd11f05d2ea59af267ca33dcf':
Fix issue #4554429 : API REVIEW: deprecate Live Folders
2011-09-02 10:39:53 -07:00
Dianne Hackborn
c592e8e61a
Merge "Fix issue #4554429 : API REVIEW: deprecate Live Folders"
2011-09-02 10:37:38 -07:00
Jeff Sharkey
ce8c430a75
am 52f159c7: Merge "Fix notification ticker info text alignment."
...
* commit '52f159c79e4ed3367a929f4bc34ab3e184f82a15':
Fix notification ticker info text alignment.
2011-09-02 10:10:08 -07:00
Jeff Sharkey
52f159c79e
Merge "Fix notification ticker info text alignment."
2011-09-02 10:07:58 -07:00
Mike Lockwood
189a6db36b
am c4589608: Merge "Fix logic for power button overridding the "wait for prox negative state" after a call"
...
* commit 'c458960886322a4403a1deb89ffbe3a24f9ee470':
Fix logic for power button overridding the "wait for prox negative state" after a call
2011-09-02 10:06:15 -07:00
Mike Lockwood
c458960886
Merge "Fix logic for power button overridding the "wait for prox negative state" after a call"
2011-09-02 10:04:11 -07:00
Russell Brenner
e8a7a72b96
Add Armenian and Georgian fonts
...
Add Armenian (25K) and Georgian (47K) to all devices.
Bug: 5240378
Change-Id: Ia16c6db54923eb9e27c931dfd2f3c3b052361307
2011-09-02 09:48:47 -07:00
Andreas Huber
281b7d063d
am 69a5f6c3: Properly serialize access to FileSource::getSize by acquiring the mutex
...
* commit '69a5f6c3e04aa0f3f87eed7578a32782c97bd48f':
Properly serialize access to FileSource::getSize by acquiring the mutex
2011-09-02 09:45:37 -07:00
Andreas Huber
69a5f6c3e0
Properly serialize access to FileSource::getSize by acquiring the mutex
...
Both ::getSize and ::read call into lseek64, if this happens simultaneously
from multiple threads the results are undefined if not properly serialized.
Change-Id: I737cafebd836f3d8eb702beac557b4731f69c6f6
related-to-bug: 5196490
2011-09-02 09:34:51 -07:00
Gilles Debunne
e90bed18cc
Added an add to dictionary option in suggestions for misspelled words
...
Change-Id: I031f17a76b4a81ae375b778046b8c391f9b8b2b2
2011-09-02 09:04:26 -07:00
Mike Lockwood
db97f60054
Fix logic for power button overridding the "wait for prox negative state" after a call
...
When in a phone call, we keep the screen off while the prox sensor returns positive
and the device is oriented in a vertical position.
If the call is terminated on the other end, we keep the screen off
until the proximity sensor returns negative.
We do this to avoid having the screen turn on as soon as the other end
hangs up while the phone is still next to your head.
However, we allow the power button to wake the screen while waiting for the proximity
sensor to go negative as a precaution in case there is a problem with the proximity sensor.
But unfortunately that logic broke due to a change in the call path used to turn the screen
on from the power button (it previously called userActivity, now it uses a wake lock).
This change adds code to handle the new code path so the power button will wake the screen
while we are waiting for the proximity sensor to go negative after a call.
Bug: 5184524
Change-Id: I7d1e0f0d1f78680c552a05d68a392647823250ab
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-02 11:59:08 -04:00
satok
735e67bf57
am bffb83e9: Merge "Add an option for the implicitly selected subtype"
...
* commit 'bffb83e96c2f3d01bf42490737201ab4de79c91b':
Add an option for the implicitly selected subtype
2011-09-02 04:48:08 -07:00
satok
bffb83e96c
Merge "Add an option for the implicitly selected subtype"
2011-09-02 04:44:41 -07:00
satok
a86f5e448c
Add an option for the implicitly selected subtype
...
Bug: 5057886
Change-Id: Iddde4724891501b4f18cade6a3d2c64b6124e58a
2011-09-02 20:27:38 +09:00
Dave Burke
1065251c7d
am 1d477c53: Merge "Require INTERNET permission for network-based content. Bug #1870981 "
...
* commit '1d477c53bf2f389813d04d5163d210fccf00ceb9':
Require INTERNET permission for network-based content. Bug #1870981
2011-09-02 03:32:31 -07:00
satok
4ef47c22ec
am ee5e77ca: Make setAdditionalInputMethodSubtypes async
...
* commit 'ee5e77cafec2eae70890abdcc1646ed39b06eddd':
Make setAdditionalInputMethodSubtypes async
2011-09-02 03:32:26 -07:00
Dave Burke
1d477c53bf
Merge "Require INTERNET permission for network-based content. Bug #1870981 "
2011-09-02 03:30:53 -07:00
Dave Burke
fc301b0bb5
Require INTERNET permission for network-based content.
...
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
2011-09-02 11:26:59 +01:00
satok
ee5e77cafe
Make setAdditionalInputMethodSubtypes async
...
Bug: 5120261
Change-Id: Ic7869cfaa5361531e08d58d7dfa5ba0feab0613e
2011-09-02 19:22:50 +09:00
satok
400617a8b2
am 117999d1: Make the spell checker session static
...
* commit '117999d1f44ec3423369385495ae207898b7b73e':
Make the spell checker session static
2011-09-02 02:01:04 -07:00
satok
117999d1f4
Make the spell checker session static
...
Change-Id: I66d51f33e005f46465232d3fc460cda0609609ea
2011-09-02 17:55:43 +09:00
satok
8f4055b638
am a2f69c91: Merge "Make the constructor of InputMethodSubtype hidden."
...
* commit 'a2f69c914dbb8cbd8761bff3ec4399e500e62674':
Make the constructor of InputMethodSubtype hidden.
2011-09-01 23:24:11 -07:00
satok
a2f69c914d
Merge "Make the constructor of InputMethodSubtype hidden."
2011-09-01 23:22:55 -07:00
satok
3889e492bc
Make the constructor of InputMethodSubtype hidden.
...
The constructor is not open sourced yet.
Change-Id: I69385b05cb3b5ee761a5ece9be877a8682c5fe55
2011-09-02 15:12:20 +09:00
Jeff Sharkey
e916f70996
Fix notification ticker info text alignment.
...
Bug: 5215277
Change-Id: I8df97a56056cd79b44a69b1c8b9852e2082c87b9
2011-09-01 22:27:09 -07:00
Irfan Sheriff
5dd0657ffc
am 1d5f9cdc: Merge "Prepare for exposing p2p API"
...
* commit '1d5f9cdc46a8020f62a30a312974f39cfe6b166a':
Prepare for exposing p2p API
2011-09-01 21:48:44 -07:00
Irfan Sheriff
1d5f9cdc46
Merge "Prepare for exposing p2p API"
2011-09-01 21:46:54 -07:00
Jeff Sharkey
5472ac3c70
am 9b69a04e: Merge "Sample network statistics for sanity check."
...
* commit '9b69a04e24e70a8e82e1820c877c8f4df0c7a980':
Sample network statistics for sanity check.
2011-09-01 21:32:42 -07:00
Jeff Sharkey
ece369ad5e
am c7f159e2: Merge "Selectively add stats based on iface active state."
...
* commit 'c7f159e29f1522a8c362145f8d454c21fc1e920e':
Selectively add stats based on iface active state.
2011-09-01 21:32:39 -07:00
Jeff Sharkey
9b69a04e24
Merge "Sample network statistics for sanity check."
2011-09-01 21:31:21 -07:00
Jeff Sharkey
c7f159e29f
Merge "Selectively add stats based on iface active state."
2011-09-01 21:31:15 -07:00
Kristian Monsen
d4954b6352
am ff713028: Merge "Close idle connections on pause timers"
...
* commit 'ff7130288f5df81f654cc008cfea33c263882722':
Close idle connections on pause timers
2011-09-01 20:33:29 -07:00