Chris Craik
2b126b6c40
am 46ec729a: Merge "Clean up unused resources" into klp-dev
...
* commit '46ec729a88079d3878a95a57ab703e64638dfc1a':
Clean up unused resources
2013-10-08 10:29:29 -07:00
Chris Craik
46ec729a88
Merge "Clean up unused resources" into klp-dev
2013-10-08 17:26:59 +00:00
Torne (Richard Coles)
0544b87249
am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit 'facf26c0531c981fb61f07f23ffe9aa0221564ea':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-10-08 10:19:36 -07:00
Adam Powell
68f60fc159
am 2d3f3b1c: Merge "Fix typo in drawable xml" into klp-dev
...
* commit '2d3f3b1c8095f7f92d084a90ff4311ef48ff2aff':
Fix typo in drawable xml
2013-10-08 10:19:34 -07:00
Torne (Richard Coles)
facf26c053
Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
2013-10-08 17:17:07 +00:00
Adam Powell
2d3f3b1c80
Merge "Fix typo in drawable xml" into klp-dev
2013-10-08 17:15:39 +00:00
Adam Powell
0b6afb3356
Fix typo in drawable xml
...
Bug 11130411
Change-Id: I76e1f5f684b17a4fa9e3e7064f7ab66029171c70
2013-10-08 10:10:40 -07:00
Jonathan Dixon
be706eb1c1
Hide Experimental WebView from dev settings DO NOT MERGE
...
Bug 10427705
The persist.webview system property is no longer needed, so removed too.
Change-Id: I8f02736469464b52636f3d59ec8537d11766d39f
2013-10-08 17:59:13 +01:00
John Spurlock
c0ee1ff48a
am e60b7bf7: Merge "Don\'t crop top-most windows at rest." into klp-dev
...
* commit 'e60b7bf7f570a93cbab48e3763cb50d51ee4aa03':
Don't crop top-most windows at rest.
2013-10-08 09:39:23 -07:00
Svetoslav Ganov
84e95d19d2
am c2242aac: Merge "Show unavailable printers disabled and grayed out." into klp-dev
...
* commit 'c2242aac0cd6c214422a1507dfd4b4673642cd98':
Show unavailable printers disabled and grayed out.
2013-10-08 09:39:21 -07:00
John Spurlock
e60b7bf7f5
Merge "Don't crop top-most windows at rest." into klp-dev
2013-10-08 16:36:49 +00:00
Svetoslav Ganov
b02b14b21e
am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev
...
* commit 'ef4a6f866241852f60a25b7c0bca41750dee816e':
Do not do a layout and write while a cancellation is in progress.
2013-10-08 09:35:48 -07:00
Svetoslav Ganov
06c74315e9
am 92f8648e: Merge "Make the print dialog floating." into klp-dev
...
* commit '92f8648ebd5b569d489420badd1895df763085ae':
Make the print dialog floating.
2013-10-08 09:35:45 -07:00
Svetoslav Ganov
c2242aac0c
Merge "Show unavailable printers disabled and grayed out." into klp-dev
2013-10-08 16:34:59 +00:00
Svetoslav Ganov
ef4a6f8662
Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev
2013-10-08 16:34:27 +00:00
Svetoslav Ganov
92f8648ebd
Merge "Make the print dialog floating." into klp-dev
2013-10-08 16:32:52 +00:00
Svetoslav Ganov
69b91e0ecb
Show unavailable printers disabled and grayed out.
...
1. If a printer is not available it has to disabled and grayed out.
2. Cancle a print job if the app does not provide the requested pages.
3. Fix current printer selection flicker when the print dialog is
showing up. Often the current printer is initially set to the user's
favorite and then it is changed back to the PDF one.
bug:10983508
Change-Id: I8d53eb992cf1c92675ec09f61b2ec272b962fa68
2013-10-08 09:08:19 -07:00
John Spurlock
65567d4e6c
Don't crop top-most windows at rest.
...
They can affect the system decor state, cropping to their
current requested state is too aggressive.
Bug:11079003
Change-Id: Ifec576d41cdefd1b851463d4b12311f1a8e27b3d
2013-10-08 11:49:47 -04:00
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
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
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
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
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
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
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
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
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
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
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
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