John Spurlock
a348b26b51
am c8670bbd: Merge "Remove remaining (unused) sysui asset in classic blue." into klp-dev
...
* commit 'c8670bbd0a3ded1d4c6d98f85b3a8c75f9e3428e':
Remove remaining (unused) sysui asset in classic blue.
2013-10-08 07:40:51 -07:00
John Spurlock
c8670bbd0a
Merge "Remove remaining (unused) sysui asset in classic blue." into klp-dev
2013-10-08 14:38:35 +00:00
John Spurlock
404cd06f54
Remove remaining (unused) sysui asset in classic blue.
...
Bug: 10918599
Change-Id: I417b32f30dae4211a492120e35716da434a6474b
2013-10-08 14:37:43 +00:00
John Spurlock
ab8b41e241
am 1fbd7982: am 1ef5865c: Merge "Turn debugging off prior to ship." into klp-dev
...
* commit '1fbd7982976f89700c6b6f42ebf17fbf0d1f78ef':
Turn debugging off prior to ship.
2013-10-08 07:02:16 -07:00
John Spurlock
1fbd798297
am 1ef5865c: Merge "Turn debugging off prior to ship." into klp-dev
...
* commit '1ef5865c29bf2ffbff1e1b158c6db6b3cf304bd6':
Turn debugging off prior to ship.
2013-10-08 06:59:31 -07:00
John Spurlock
1ef5865c29
Merge "Turn debugging off prior to ship." into klp-dev
2013-10-08 13:56:32 +00:00
John Spurlock
342cad772b
Turn debugging off prior to ship.
...
Bug:10488453
Change-Id: I37680c6b0c24f00f4fe3926ee97d2a14edb1ced7
2013-10-08 09:39:26 -04:00
Leon Scroggins III
25c4e98711
am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev
...
* commit '97b707d5eb34d5e76e2b820c158b14fe47631be0':
Do not attempt to decode NULL SkData.
2013-10-08 06:38:45 -07:00
Leon Scroggins III
97b707d5eb
am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev
...
* commit '80a058b3033200835f86ee0e61367a87a470cde8':
Do not attempt to decode NULL SkData.
2013-10-08 06:35:04 -07:00
Leon Scroggins III
80a058b303
Merge "Do not attempt to decode NULL SkData." into klp-dev
2013-10-08 13:33:05 +00:00
Lorenzo Colitti
143a2cf413
Fix captive portal detection on IPv6 networks.
...
Currently the captive portal check URL is generated by
concatenating scheme, "://", IP address, and port. This breaks
for IPv6 because IPv6 addresses in URLs must be enclosed in
square brackets (e.g., http://2001:db8::1/generate_204 is
invalid; should he http://[2001:db8::1]/generate_204 instead).
The resulting MalformedURLException causes isMobileOk to report
that there is no captive portal, even if there is one.
Fortunately the three-arg URL constructor already knows how to
construct URLs with IPv6 addresses. Use that instead of
generating the URL ourselves.
Bug: 10801896
Change-Id: I02605ef62f493a34f25bb405ef02b111543a76fd
2013-10-08 14:15:14 +09:00
Jim Miller
5547b55bae
Disable dragging the challenge area when there are no widgets
...
Fixes bug 10784855
Change-Id: Id1d752eb4bdc64a9d09fd478087d16dc17682c77
2013-10-07 19:20:56 -07:00
Jim Miller
04e3a2aaf5
am d386c0a4: am be5ba9a2: Merge "Update search asset with new new new asset." into klp-dev
...
* commit 'd386c0a4f312f4f6fc4d621a358c2850516a8292':
Update search asset with new new new asset.
2013-10-07 18:56:29 -07:00
Jim Miller
d386c0a4f3
am be5ba9a2: Merge "Update search asset with new new new asset." into klp-dev
...
* commit 'be5ba9a255e258e03925bb651e5563625ddf6d59':
Update search asset with new new new asset.
2013-10-07 18:53:59 -07:00
Jim Miller
be5ba9a255
Merge "Update search asset with new new new asset." into klp-dev
2013-10-08 01:52:13 +00:00
Jim Miller
2de3b6be0b
Update search asset with new new new asset.
...
Fixes bug 11102853
Change-Id: Icab95409e0b641858e301157ad3f56542bb6d4f8
2013-10-07 18:40:43 -07:00
Alan Viverette
24cafbc56c
Fix HIDE_DESCENDANTS accessibility importance mode
...
Ensures accessibility framework is notified when subtree visibility
changes as a result of hiding descendants. Fixes collision between
HAS_TRANSIENT_STATE flag and IMPORTANT_FOR_ACCESSIBILITY mask.
BUG: 11087525
Change-Id: I92dba27350970a09e76b5a878c7604ea06cae197
2013-10-07 18:28:45 -07:00
Svetoslav Ganov
b20d63a671
Make the print dialog floating.
...
The print dialog was full-screen which was not really needed and was
causing the dialog to jump instead of animate up/down when the IME
shows/hides.
bug:11116648
Change-Id: Ifb46fd80a90948270a1fa9c875258b8d0cdfc111
2013-10-07 18:21:59 -07:00
Alan Viverette
80fad29231
am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev
...
* commit '6d774ac6049de8bf347a735eb67c491bb2623aa1':
Provide example actions in AccessibilityEvent.setAction() docs
2013-10-07 18:15:05 -07:00
Alan Viverette
6d774ac604
am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev
...
* commit 'bdae814816085ac9d4a48580e86a7ef4a0bcb5d6':
Provide example actions in AccessibilityEvent.setAction() docs
2013-10-07 18:11:45 -07:00
Alan Viverette
bdae814816
Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev
2013-10-08 01:09:00 +00:00
Jim Miller
c2cbd158b4
am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev
...
* commit 'c4c52ccbaafccd1626bc8455641c3f9fc25b023c':
Disable camera and search from some security screens.
2013-10-07 17:54:44 -07:00
Alan Viverette
e4ccb864e8
am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev
...
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
Ignore certain WindowManager flags when touch exploration is enabled
2013-10-07 17:54:42 -07:00
Jim Miller
c4c52ccbaa
am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev
...
* commit '961d2f4643e9b3f6f774ab9567c36f659f423254':
Disable camera and search from some security screens.
2013-10-07 17:51:33 -07:00
Alan Viverette
1bdbdfbe6a
am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev
...
* commit '6930d3805e1f0e770c636b8419a105bc19919048':
Ignore certain WindowManager flags when touch exploration is enabled
2013-10-07 17:51:30 -07:00
Jean-Michel Trivi
47f698b88e
am c38c93f4: am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev
...
* commit 'c38c93f4deb80d1df7acf915cdf2df17cc7cc548':
Update RemoteController info when enabling/disabling it
2013-10-07 17:50:08 -07:00
Jim Miller
961d2f4643
Merge "Disable camera and search from some security screens." into klp-dev
2013-10-08 00:49:23 +00:00
Jean-Michel Trivi
c38c93f4de
am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev
...
* commit '1a1e24f18ea6bdcc7ad1335a6edf6b6740e6e39b':
Update RemoteController info when enabling/disabling it
2013-10-07 17:47:57 -07:00
Alan Viverette
6930d3805e
Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev
2013-10-08 00:47:23 +00:00
Jean-Michel Trivi
1a1e24f18e
Merge "Update RemoteController info when enabling/disabling it" into klp-dev
2013-10-08 00:45:54 +00:00
Michael Jurka
e581234746
am 9aa58405: am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev
...
* commit '9aa58405ccddfcaace0387c7e052c88b9cc754b7':
Fix crash in built-in wallpaper cropper
2013-10-07 17:25:13 -07:00
Michael Jurka
9aa58405cc
am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev
...
* commit '5dadf8389eed7b0bf04bcbf89d10f13d366b2d68':
Fix crash in built-in wallpaper cropper
2013-10-07 17:22:02 -07:00
Craig Mautner
4a38b0ab92
am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev
...
* commit '972a985590266e457d4a13400dfb5797d7b85908':
Yet more debugging for 10858941.
2013-10-07 17:21:41 -07:00
Craig Mautner
972a985590
am b729e995: Merge "Yet more debugging for 10858941." into klp-dev
...
* commit 'b729e99578b072918eb4057226329b078173c868':
Yet more debugging for 10858941.
2013-10-07 17:18:33 -07:00
Michael Jurka
5dadf8389e
Merge "Fix crash in built-in wallpaper cropper" into klp-dev
2013-10-08 00:18:02 +00:00
Michael Wright
d07179ba23
am 7c677bb8: am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev
...
* commit '7c677bb8220023bc83ef5b78a8e298ef4d3ab463':
Show no_sim icon when no SIM card is available.
2013-10-07 17:16:58 -07:00
Craig Mautner
b729e99578
Merge "Yet more debugging for 10858941." into klp-dev
2013-10-08 00:16:41 +00:00
Michael Wright
7c677bb822
am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev
...
* commit 'bf33f34c1b8e6483cefd3abefbe212f4583f6e6c':
Show no_sim icon when no SIM card is available.
2013-10-07 17:14:00 -07:00
Jim Miller
9c993bd6ba
Disable camera and search from some security screens.
...
This disables showing the camera and search buttons in the
navbar while SIM, PUK and Account security screens are showing.
Fixes bug 10991981
Change-Id: Ic64adc079685948f8c1114dbdefa42a671948350
2013-10-07 17:13:45 -07:00
Svetoslav Ganov
db63677c7c
Do not do a layout and write while a cancellation is in progress.
...
While printing the app gets callbacks to do a layout and a write. Since
these operations can take a very long time they are implemented in a async
fashion. For example, if there is a layout request while we are still doing
a layout, we ask the application to cancel the previous layout. The problem
was that we were not waiting for the cancellation result before calling
the subsequent layout. Hence, the app ends up having to do two layouts at
the same time which breaks the printing contract. Same for write.
bug:11118426
Change-Id: If7b191c44387d88d5cec195d1785a47f986965ba
2013-10-07 17:13:01 -07:00
Jean-Michel Trivi
19566543c4
Update RemoteController info when enabling/disabling it
...
When a RemoteController listener is disabled: send its listener
"blank" information (no artist, "stopped state"...)
When a RemoteController listener is enabled: have the current
RemoteControlClient send the current information.
Bug 8209392
Change-Id: I375bf3c42a425ada94c61453b51669d7e819dde4
2013-10-07 17:10:08 -07:00
Michael Wright
bf33f34c1b
Merge "Show no_sim icon when no SIM card is available." into klp-dev
2013-10-08 00:10:05 +00:00
Baligh Uddin
49c1b2ace9
am ceb436ec: (-s ours) am 29cd41db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'ceb436ec46546714fdc59fb40886658e49879eeb':
Import translations. DO NOT MERGE
2013-10-07 17:06:49 -07:00
Baligh Uddin
61438f5ff5
am 01e1ecd0: (-s ours) am 8fcb6a56: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '01e1ecd0dbb336c63890c18fa4133712460651e8':
Import translations. DO NOT MERGE
2013-10-07 17:06:46 -07:00
Baligh Uddin
370933a76e
am fb93b65b: (-s ours) am f78c7884: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'fb93b65b53299edb3d7c31d5249f8febdc25acf5':
Import translations. DO NOT MERGE
2013-10-07 17:06:43 -07:00
Michael Jurka
e72aa7f0a6
Fix crash in built-in wallpaper cropper
...
Also, sync to latest version of WallpaperCropActivity
Bug: 10950237
2013-10-07 17:06:23 -07:00
Baligh Uddin
ceb436ec46
am 29cd41db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '29cd41dbaea6d41c4cb7b6a7c1e231fda35cf3dc':
Import translations. DO NOT MERGE
2013-10-07 17:03:35 -07:00
Baligh Uddin
01e1ecd0db
am 8fcb6a56: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8fcb6a56cb460a9921011b826550c0df211a3689':
Import translations. DO NOT MERGE
2013-10-07 17:03:32 -07:00
Baligh Uddin
fb93b65b53
am f78c7884: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f78c7884edf73024445e443bde77f68f292369cd':
Import translations. DO NOT MERGE
2013-10-07 17:03:29 -07:00
Baligh Uddin
502e7c70d3
am c6f1c8a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit 'c6f1c8a8bb871db3d3a0212fbdaee4a2b7cc09fd':
Import translations. DO NOT MERGE
2013-10-07 17:03:09 -07:00