Steve Block
b56ed30666
Fix style for Geolocation mock mechanism
...
See I6d88d5dce5c2148812b191a5b452718bf0854aeb
Change-Id: I1179319f066664393aa5f7324df89f8057a9e922
2012-05-29 16:20:03 +01:00
Jean Chalard
405bc51c5d
Add/refine comments to reflect key event policies
...
Make clearer how the platform is handling key events following some
unfortunate uses by third party applications. Also highlight the
changes in Jelly Bean default keyboard.
Bug: 6566711
Change-Id: Ibcdaf54c6d629fd0733529bfe2fffc82f555f084
2012-05-29 19:41:02 +09:00
Wu-cheng Li
e9c6c9ccfd
Fix startFaceDetection will fail after taking a picture.
...
bug:6568961
Change-Id: I353c24496ec00805ed46ba90457729dfb5b2c337
2012-05-29 16:47:44 +08:00
Ben Murdoch
1bd37b176e
Deprecate WebChromeClient.onJsTimeout
...
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.
Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
2012-05-28 14:20:07 +01:00
John Reck
83a40e8e64
am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
...
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
Copy over the scroll position for the scrolling layer
2012-05-25 15:56:48 -07:00
John Reck
2611f1eced
am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
...
* commit '7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
Copy over the scroll position for the scrolling layer
2012-05-25 15:51:58 -07:00
John Reck
7cbe645730
Merge "Copy over the scroll position for the scrolling layer" into jb-dev
2012-05-25 15:49:15 -07:00
Christopher Tate
f5491fc1b6
Prevent construction/use of invalid restore session proxies
...
Possible (rare) null return was not being handled. Fixes
bug 6554812.
Change-Id: I470e916f2156ff7ed2947d6ce21ef2816fc7f97d
2012-05-25 14:14:49 -07:00
John Reck
ec1b71adc6
Copy over the scroll position for the scrolling layer
...
Bug: 6557664
Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
2012-05-25 14:02:26 -07:00
Gilles Debunne
31d869ce07
am 1cf99631: am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev
...
* commit '1cf99631ca6859785ef5716def75169f77b1bee3':
Fix for IOOB in SearchView
2012-05-25 12:50:14 -07:00
Gilles Debunne
1cf99631ca
am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev
...
* commit '18afc622c3d80713a6ffb91792cce399e1715bfb':
Fix for IOOB in SearchView
2012-05-25 12:46:09 -07:00
Gilles Debunne
18afc622c3
Merge "Fix for IOOB in SearchView" into jb-dev
2012-05-25 12:43:39 -07:00
Christopher Tate
c0ed6efe5f
am 115284bc: Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah
...
* commit '115284bc124ce2874f32ad36956f475959513388':
Support volume-changed sounds on master-volume-only configs
2012-05-25 11:57:35 -07:00
Teng-Hui Zhu
0926424028
am 314745cd: am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
...
* commit '314745cd5661db8672505ec753a6f88b9e80e609':
Better support for HTML5 audio loop.
2012-05-25 10:18:09 -07:00
Teng-Hui Zhu
314745cd56
am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
...
* commit '65e08329ee57f2c4cda679885db700ceaca6c842':
Better support for HTML5 audio loop.
2012-05-25 10:13:08 -07:00
Teng-Hui Zhu
65e08329ee
Merge "Better support for HTML5 audio loop." into jb-dev
2012-05-25 10:10:11 -07:00
Jean-Baptiste Queru
4b33266935
am c6df8417: am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
...
* commit 'c6df8417eaf60f80b2741ec29e8188324de95af3':
Wipe the user data out in any case.
2012-05-25 08:17:49 -07:00
Jean-Baptiste Queru
c6df8417ea
am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
...
* commit '541803ccc530b8cc1d8d95aa5a82ebc191fc218c':
Wipe the user data out in any case.
2012-05-25 08:13:03 -07:00
Jean-Baptiste Queru
541803ccc5
am fd63c857: Merge "Wipe the user data out in any case."
...
* commit 'fd63c85742f4b12065418d48ae10be4bb12468f5':
Wipe the user data out in any case.
2012-05-25 08:09:39 -07:00
Jean-Baptiste Queru
fd63c85742
Merge "Wipe the user data out in any case."
2012-05-25 07:31:27 -07:00
Chris Wren
adde6eb394
am af948894: am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
...
* commit 'af948894195d2af09295210d4266bb45c4f4ba9e':
Squelch the logs from SizeAdaptiveLayout.
2012-05-25 06:27:45 -07:00
Chris Wren
af94889419
am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
...
* commit '04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758':
Squelch the logs from SizeAdaptiveLayout.
2012-05-25 06:24:12 -07:00
Chris Wren
04b63f6fb0
Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
2012-05-25 06:21:56 -07:00
Gilles Debunne
2427192e58
Fix for IOOB in SearchView
...
Bug 6476578
The latest bug report show a query.length() of 33 while
mQueryTextView.length() is 0 on line 514.
I can see 2 reasons which can explain this discrepancy:
- the mQueryTextView has a filter, which alters the text.
- some asynchronous event (IME?) changes the text in the mean time.
I would favor the second one, which seems to break a lot of single
thread assumptions in the code and generates other IOOB exceptions.
Note that depending on what they are used for, it may be more consistent
to use mQueryTextView.getText() instead of query in the following
assignment.
Change-Id: Ie8a5486b11a80543f8f90980454933c5a74c073e
2012-05-25 14:04:05 +02:00
Jean-Michel Trivi
3266873f7f
am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
...
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
Unhide KeyguardManager locked and secure state getters
2012-05-24 18:34:07 -07:00
Jean-Michel Trivi
b3db8dc9f1
am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
...
* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
Unhide KeyguardManager locked and secure state getters
2012-05-24 18:29:39 -07:00
Jean-Michel Trivi
97594d6cea
Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
2012-05-24 18:27:37 -07:00
John Reck
fcf4c34545
am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
...
* commit '731327a93a9e5f1550effaf48fb944d8cae507d5':
Support skipping a touch stream due to lack of handlers
2012-05-24 18:18:07 -07:00
John Reck
731327a93a
am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
...
* commit 'f738810247b887082dbf4ca3a867f8d9e1955001':
Support skipping a touch stream due to lack of handlers
2012-05-24 18:13:52 -07:00
John Reck
f738810247
Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
2012-05-24 18:11:36 -07:00
Jean-Michel Trivi
37fde0aca0
Unhide KeyguardManager locked and secure state getters
...
Unhide the following methods:
android.app.KeyguardManager.isKeyguardLocked()
android.app.KeyguardManager.isKeyguardSecure()
Fix some javadoc typos
Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
2012-05-24 18:09:44 -07:00
Jim Miller
9a1a3ab84e
am 4414bdef: am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
...
* commit '4414bdefe1ac1559f2c4d2658a28ed80abc84482':
Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:59:54 -07:00
Jim Miller
4414bdefe1
am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
...
* commit '73bde11e624c44620819e9c93a61ca6be6e96997':
Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:56:02 -07:00
Jim Miller
73bde11e62
Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
2012-05-24 17:51:10 -07:00
Christopher Tate
c4b78d206f
Support volume-changed sounds on master-volume-only configs
...
Some products manipulate only the master volume, and the existing
code does not play volume-change tones when the master volume
is adjusted. This CL includes some config-driven behavior that
will play those tones (via the system stream) if desired.
Bug 6498986
Change-Id: I2415773325d0a0039efc67897bc371b1f2e18063
2012-05-24 17:30:39 -07:00
Jim Miller
960892c0af
Fix 6547012: ignore events outside the home/back/recent navigation area
...
This fixes the search panel to only show if touch events originate
in the home/back/recent area.
Change-Id: I370da8b5c5613b7bbab5d266ba51a61df8f3a57b
2012-05-24 17:02:31 -07:00
John Reck
c1e80a360a
Support skipping a touch stream due to lack of handlers
...
Bug: 6317798
Change-Id: Ia1652e9030e877e270326e9e8a8b040810b89f09
2012-05-24 15:31:13 -07:00
Teng-Hui Zhu
6f62ef32e2
Better support for HTML5 audio loop.
...
Loop is trigger by a seek to 0 when ended on native side but there is no play
call. So on java side, we detect this and call into native side to trigger a
play after completion.
This fixed the UI problem and keep in sync with the native mode.
Beyond that, we don't need to reload for looping and we don't have the seek
to play artifacts.
bug:5461143
webkit change:
https://android-git.corp.google.com/g/#/c/193750/
Change-Id: I779f3e1fbc789832a1a99d1f17823db6b57b35df
2012-05-24 15:24:29 -07:00
Fred Quintana
d9640ec712
Add an updateAppPermission() API call to the AccountManagerService AIDL
...
and have the GrantCredentialsPermissionActivity call that instead of a
static so that it can be made to run in a different process than the
AccountManagerService. Protect this call by checking that the caller
has the same UID as the system process.
Bug: 6545417
Change-Id: I295e65cad68883349a47e7927c171af45c89b229
2012-05-24 14:34:43 -07:00
Romain Guy
98fd5a5fbc
am ed130313: am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840 " into jb-dev
...
* commit 'ed1303132912f0d39bcd008c3efbc0422d7433fc':
Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:33:53 -07:00
Romain Guy
ed13031329
am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840 " into jb-dev
...
* commit '94328c308bc8d283841ac6434d47b4c56389a388':
Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:28:22 -07:00
Romain Guy
94328c308b
Merge "Clear bitmap references from display lists as early as possible Bug #6555840 " into jb-dev
2012-05-24 14:25:44 -07:00
Romain Guy
38c2ece5ce
Clear bitmap references from display lists as early as possible
...
Bug #6555840
Apps like Google+ with large bitmaps displayed in listivews could
run into memory issues because of these references.
Change-Id: I39486bda13ce00c5a3b6481139ad54547506a8b4
2012-05-24 14:20:56 -07:00
Fabrice Di Meglio
c30d1ad8f3
am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
...
* commit '07e28d1e9bd7373c83cb66d5d9e93ae9af1f090d':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:13:42 -07:00
George Mount
a893591ff6
am 4f313676: am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
...
* commit '4f3136768038398e109a66d393d74858d2754a34':
Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 11:13:25 -07:00
Fabrice Di Meglio
07e28d1e9b
am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
...
* commit '0100625bb316ecbd99873b72756ffba8613c3456':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 10:45:54 -07:00
Fabrice Di Meglio
0100625bb3
Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
2012-05-24 10:42:23 -07:00
Ben Murdoch
b9fcb1334d
resolved conflicts for merge of cde7efde to master
...
Change-Id: I44433670a897c23b3bd388cbba9cfacf80e3345f
2012-05-24 18:02:56 +01:00
George Mount
4f31367680
am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
...
* commit '222f56135026627637e9db4801d6532b1ff16657':
Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 09:56:16 -07:00
George Mount
222f561350
Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
2012-05-24 09:53:17 -07:00