Jeff Brown
51f9ad1f6e
am 16e64d1a: am 731b8996: Merge "Run with scissors." into jb-mr1-dev
...
* commit '16e64d1ac6e1fac38f7af4fd2d68cfe6ebd994be':
Run with scissors.
2012-08-29 15:48:14 -07:00
Jeff Brown
16e64d1ac6
am 731b8996: Merge "Run with scissors." into jb-mr1-dev
...
* commit '731b8996eaa7e45b206273d4691506069229449a':
Run with scissors.
2012-08-29 15:44:51 -07:00
Selim Gurun
49444838dc
am 3b82c5de: am 8506ce1a: Merge "Provide referer to browser on download request." into jb-mr1-dev
...
* commit '3b82c5de7f8da48cdfb45654be1773ac67cf6729':
Provide referer to browser on download request.
2012-08-29 15:44:46 -07:00
Jeff Brown
731b8996ea
Merge "Run with scissors." into jb-mr1-dev
2012-08-29 15:41:57 -07:00
Selim Gurun
3b82c5de7f
am 8506ce1a: Merge "Provide referer to browser on download request." into jb-mr1-dev
...
* commit '8506ce1a3f427d4c3495d6ec13c1b644aa4701fe':
Provide referer to browser on download request.
2012-08-29 15:41:36 -07:00
Selim Gurun
8506ce1a3f
Merge "Provide referer to browser on download request." into jb-mr1-dev
2012-08-29 15:39:11 -07:00
Svetoslav Ganov
c2e57573e3
am 5954d97c: am f0340d15: Merge "Don\'t overwrite accessibility delegates in AbsListView items." into jb-mr1-dev
...
* commit '5954d97c9c7f823f0089e6ba39b318eae9d795e5':
Don't overwrite accessibility delegates in AbsListView items.
2012-08-29 14:26:47 -07:00
Svetoslav Ganov
5954d97c9c
am f0340d15: Merge "Don\'t overwrite accessibility delegates in AbsListView items." into jb-mr1-dev
...
* commit 'f0340d156c9adf974cba36e806049f66e111fab7':
Don't overwrite accessibility delegates in AbsListView items.
2012-08-29 14:24:20 -07:00
Svetoslav Ganov
f0340d156c
Merge "Don't overwrite accessibility delegates in AbsListView items." into jb-mr1-dev
2012-08-29 14:21:18 -07:00
Jim Miller
29da8387bf
am 99a97d52: am d45e5f61: Merge "Enable new keyguard" into jb-mr1-dev
...
* commit '99a97d526330483482b27c2c7c1fb2f2a692494f':
Enable new keyguard
2012-08-29 14:02:01 -07:00
Jim Miller
99a97d5263
am d45e5f61: Merge "Enable new keyguard" into jb-mr1-dev
...
* commit 'd45e5f610ca976cf5a56ce12ba18b39497243fe3':
Enable new keyguard
2012-08-29 13:59:37 -07:00
Jim Miller
d45e5f610c
Merge "Enable new keyguard" into jb-mr1-dev
2012-08-29 13:57:14 -07:00
Jim Miller
9c7e630e3f
Enable new keyguard
...
Change-Id: I52af2d4f9083120616f012138a60b557a0eb70cf
2012-08-29 13:48:34 -07:00
Jean-Baptiste Queru
d50eff5935
am 959c05a1: am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
...
* commit '959c05a122fbe44fd97860ae11ef6be84b52d31e':
Make addAddress locale safe
2012-08-29 13:08:41 -07:00
Jean-Baptiste Queru
959c05a122
am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
...
* commit '69626dab17f9e059cfa2e8c3ce4ec9aaa5f9853e':
Make addAddress locale safe
2012-08-29 13:06:08 -07:00
Jean-Baptiste Queru
69626dab17
am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
...
* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a':
Make addAddress locale safe
2012-08-29 13:03:41 -07:00
Jean-Baptiste Queru
4a4edbbfce
am 7fecf5f4: Merge "Make addAddress locale safe"
...
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
Make addAddress locale safe
2012-08-29 12:59:06 -07:00
Jim Miller
0b63b536aa
am 8897b4f5: am c134885e: Merge "Replace keyguard with new implementation" into jb-mr1-dev
...
* commit '8897b4f530aace505a65e0ff66fdf0561a4b30fd':
Replace keyguard with new implementation
2012-08-29 12:56:46 -07:00
Jim Miller
8897b4f530
am c134885e: Merge "Replace keyguard with new implementation" into jb-mr1-dev
...
* commit 'c134885e6f2aae3a2af446623be9f195c2713bc4':
Replace keyguard with new implementation
2012-08-29 12:55:11 -07:00
Jim Miller
c134885e6f
Merge "Replace keyguard with new implementation" into jb-mr1-dev
2012-08-29 12:52:09 -07:00
Jim Miller
dcb3d84b82
Replace keyguard with new implementation
...
This change refactors keyguard to be more modular and maintainable. More
specifically, it replaces the top-level view with just one device-dependent
view that contains two views: a widget area and a security area.
The widget area can be populated with custom widgets.
The security area contains the current security method as dictated by
the stored password quality.
This change contains both the old and the new keyguard with the old keyguard
still enabled. The new keyguard will be enabled in a subsequent change.
Change-Id: Id75286113771ca1407e9db182172b580f870b612
2012-08-29 12:36:26 -07:00
Jean-Baptiste Queru
7fecf5f451
Merge "Make addAddress locale safe"
2012-08-29 12:19:04 -07:00
Jean-Baptiste Queru
ba3af4625c
am 8866d4eb: am 38f19786: am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
...
* commit '8866d4eb51f97cf3305258788b975aeb9ca50f05':
Fix SkBitmap::fPixels not being locked correctly
2012-08-29 12:04:10 -07:00
Jean-Baptiste Queru
8866d4eb51
am 38f19786: am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
...
* commit '38f197863a07cd600b45d752fdfa949d8b2e6fa6':
Fix SkBitmap::fPixels not being locked correctly
2012-08-29 12:02:11 -07:00
Jean-Baptiste Queru
38f197863a
am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
...
* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
Fix SkBitmap::fPixels not being locked correctly
2012-08-29 12:00:10 -07:00
Jean-Baptiste Queru
14c0c989d2
am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
...
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
Fix SkBitmap::fPixels not being locked correctly
2012-08-29 11:55:20 -07:00
Selim Gurun
a36dcfdfe0
Provide referer to browser on download request.
...
Bug: 6662557
Provide a private API to provide referer to browser for download
requests.
Change-Id: I6ff393caa43e16db12fb5dab38f1f26cd76bf232
2012-08-29 11:50:55 -07:00
Jean-Baptiste Queru
4ba4caede1
Merge "Fix SkBitmap::fPixels not being locked correctly"
2012-08-29 11:27:31 -07:00
Jean-Baptiste Queru
df7b5030fa
am a62d4133: am c88a80a1: am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"
...
* commit 'a62d413366e656ae9a868a548093327dd648ac7a':
Default WiFi sleep policy setting
2012-08-29 11:04:03 -07:00
Irfan Sheriff
ea9eb1a633
am e8fe1d51: am d5a1074c: am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"
...
* commit 'e8fe1d51c8b6016e3adf2a30501c0c8fb57473b1':
Fix join scenario with provision discovery
2012-08-29 11:04:00 -07:00
Jean-Baptiste Queru
a62d413366
am c88a80a1: am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"
...
* commit 'c88a80a1d7a35eaefb54d17b60e9d3a07b800e82':
Default WiFi sleep policy setting
2012-08-29 11:01:41 -07:00
Irfan Sheriff
e8fe1d51c8
am d5a1074c: am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"
...
* commit 'd5a1074c4ec8142c2ed206c9fb515dd42139ef3a':
Fix join scenario with provision discovery
2012-08-29 11:01:38 -07:00
Jean-Baptiste Queru
c88a80a1d7
am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"
...
* commit '15e099cc09589f963933f046d7267552ba3ffad8':
Default WiFi sleep policy setting
2012-08-29 10:58:35 -07:00
Irfan Sheriff
d5a1074c4e
am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"
...
* commit 'c5f34bd40bc68925c6e99da02e179227d8eb3ae4':
Fix join scenario with provision discovery
2012-08-29 10:58:30 -07:00
Jean-Baptiste Queru
15e099cc09
am 0e0942c7: Merge "Default WiFi sleep policy setting"
...
* commit '0e0942c7209c758bc00939ae54059dc24bce3abb':
Default WiFi sleep policy setting
2012-08-29 10:49:25 -07:00
Irfan Sheriff
c5f34bd40b
am 48c45d0e: Merge "Fix join scenario with provision discovery"
...
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
Fix join scenario with provision discovery
2012-08-29 10:49:20 -07:00
Jean-Baptiste Queru
0e0942c720
Merge "Default WiFi sleep policy setting"
2012-08-29 09:50:45 -07:00
Irfan Sheriff
48c45d0e3b
Merge "Fix join scenario with provision discovery"
2012-08-29 09:47:27 -07:00
Irfan Sheriff
127efc4e25
Fix join scenario with provision discovery
...
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-29 08:36:17 -07:00
Michal Stawinski
35ef567140
Fix SkBitmap::fPixels not being locked correctly
...
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.
Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
2012-08-29 15:54:01 +02:00
Mikhail Naganov
ba9b189c3d
Merge "Clarify WebSettings.setGeolocationEnabled JavaDocs."
2012-08-29 06:27:36 -07:00
Mikhail Naganov
6cb296a55c
Clarify WebSettings.setGeolocationEnabled JavaDocs.
...
The current doc is very brief and doesn't specify important
requirements.
Change-Id: I36c0cfac18d2c9a7b435b07d67d1bbabad41e2fb
2012-08-29 14:17:32 +01:00
Jeff Brown
c53abc4d42
Run with scissors.
...
Add a useful (if somewhat dangerous) method which will help
replace similarly dangerous code patterns in a few different places.
Change-Id: If1295f7ab9652c906ce718d94eb7914d143e1939
2012-08-29 06:15:21 -07:00
Erik Ljungberg
7e07147ece
Default WiFi sleep policy setting
...
Creates a defult.xml setting for WiFi sleep policy.
It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.
Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
2012-08-29 09:52:12 +02:00
Johan Redestig
3cd42dfd50
Make addAddress locale safe
...
Using regular string concatenation to avoid unexpected
results in some locales.
Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
2012-08-29 08:07:02 +02:00
Amith Yamasani
122adb0909
am 5a38afac: am 2c577f17: Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev
...
* commit '5a38afac83ec364bff8016d11cf272f126f20d67':
Fix adding live wallpaper in a second user
2012-08-28 22:52:35 -07:00
Amith Yamasani
5a38afac83
am 2c577f17: Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev
...
* commit '2c577f1777a9227c581d41d5c08d674740e39ea9':
Fix adding live wallpaper in a second user
2012-08-28 22:50:54 -07:00
Amith Yamasani
2c577f1777
Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev
2012-08-28 22:47:45 -07:00
Amith Yamasani
4e2820c22b
Fix adding live wallpaper in a second user
...
When the second user downloads a new wallpaper service, Wallpaper
service needs to query the correct user's package state to figure
out if it is available and bind to it.
Change-Id: Ifb95db1c859887f996f5b2e821b4b46510ee7016
2012-08-28 22:45:17 -07:00
Adam Powell
2d7d23beed
am 910500b1: am 04951a51: Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev
...
* commit '910500b17c429f677a711e1ab2474a2caf8f7fe7':
New implementation for ScaleGestureDetector
2012-08-28 18:57:07 -07:00