Torne (Richard Coles)
e2ea91c799
am d724ff6f: (-s ours) am 0544b872: am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit 'd724ff6fd70c428d1cda0c2bcb2746774077071b':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-10-08 10:24:59 -07:00
Adam Powell
411289ab0d
am dde19a85: am 68f60fc1: am 2d3f3b1c: Merge "Fix typo in drawable xml" into klp-dev
...
* commit 'dde19a85b5f9dc27c404775702476c90a3012ffc':
Fix typo in drawable xml
2013-10-08 10:24:54 -07:00
Torne (Richard Coles)
d724ff6fd7
am 0544b872: am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit '0544b87249ff2f58806c2464f87afcb3c32c62e8':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-10-08 10:22:01 -07:00
Adam Powell
dde19a85b5
am 68f60fc1: am 2d3f3b1c: Merge "Fix typo in drawable xml" into klp-dev
...
* commit '68f60fc1590e8f1d7d84c5a61aac2e424293ba4a':
Fix typo in drawable xml
2013-10-08 10:21:58 -07: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
ca5688efac
am 62544134: am c0ee1ff4: am e60b7bf7: Merge "Don\'t crop top-most windows at rest." into klp-dev
...
* commit '62544134749558a67715618f20df64adbf7a1d45':
Don't crop top-most windows at rest.
2013-10-08 09:47:51 -07:00
Svetoslav Ganov
70b7fd36f0
am bd91ecfa: am 84e95d19: am c2242aac: Merge "Show unavailable printers disabled and grayed out." into klp-dev
...
* commit 'bd91ecfa0de6e4833c0eb7fe3d2b8814eaa6eb80':
Show unavailable printers disabled and grayed out.
2013-10-08 09:47:47 -07:00
Svetoslav Ganov
91adc9ff6f
am 98b07f4e: am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev
...
* commit '98b07f4e1ea7c5a861c2c66278816ab6c8fd02d1':
Do not do a layout and write while a cancellation is in progress.
2013-10-08 09:44:18 -07:00
Svetoslav Ganov
a9ac787e97
am 61b1e48a: am 06c74315: am 92f8648e: Merge "Make the print dialog floating." into klp-dev
...
* commit '61b1e48afc4cb6f9a6bd33baf0022084e496abff':
Make the print dialog floating.
2013-10-08 09:44:14 -07:00
John Spurlock
6254413474
am c0ee1ff4: am e60b7bf7: Merge "Don\'t crop top-most windows at rest." into klp-dev
...
* commit 'c0ee1ff48a7f9e350d5621a37a8d3b1c515a6ca0':
Don't crop top-most windows at rest.
2013-10-08 09:42:38 -07:00
Svetoslav Ganov
bd91ecfa0d
am 84e95d19: am c2242aac: Merge "Show unavailable printers disabled and grayed out." into klp-dev
...
* commit '84e95d19d2f97dc03b235076e3134541cf161676':
Show unavailable printers disabled and grayed out.
2013-10-08 09:42:36 -07: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
Svetoslav Ganov
98b07f4e1e
am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev
...
* commit 'b02b14b21e46c531ae726094413f036ae36c56f9':
Do not do a layout and write while a cancellation is in progress.
2013-10-08 09:39:08 -07:00
Svetoslav Ganov
61b1e48afc
am 06c74315: am 92f8648e: Merge "Make the print dialog floating." into klp-dev
...
* commit '06c74315e920f91feb9536d4aa25e1dc7fc0afa9':
Make the print dialog floating.
2013-10-08 09:39:04 -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
5358642809
am 7eefc702: am a348b26b: am c8670bbd: Merge "Remove remaining (unused) sysui asset in classic blue." into klp-dev
...
* commit '7eefc7028403e5954b2e292923a28758814bdbec':
Remove remaining (unused) sysui asset in classic blue.
2013-10-08 07:45:25 -07:00
John Spurlock
7eefc70284
am a348b26b: am c8670bbd: Merge "Remove remaining (unused) sysui asset in classic blue." into klp-dev
...
* commit 'a348b26b51c687c7a6d4d192ec7177d337ba7a73':
Remove remaining (unused) sysui asset in classic blue.
2013-10-08 07:43:34 -07: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
788354917b
am ab8b41e2: am 1fbd7982: am 1ef5865c: Merge "Turn debugging off prior to ship." into klp-dev
...
* commit 'ab8b41e2415d03a48bc41fd766c440689919856b':
Turn debugging off prior to ship.
2013-10-08 07:03:44 -07: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
Leon Scroggins III
6034ee95a0
am 25c4e987: am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev
...
* commit '25c4e98711d29a69db96526e3c72604f7dbb1005':
Do not attempt to decode NULL SkData.
2013-10-08 06:41:06 -07: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
Jim Miller
3ea1c9938a
am 04e3a2aa: am d386c0a4: am be5ba9a2: Merge "Update search asset with new new new asset." into klp-dev
...
* commit '04e3a2aaf503e15b8b549443f1351eb2a4d069da':
Update search asset with new new new asset.
2013-10-07 18:59:17 -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
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
550b89e6de
am 80fad292: am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev
...
* commit '80fad292318ac2e1e76435bb8334017a702a62d7':
Provide example actions in AccessibilityEvent.setAction() docs
2013-10-07 18:17:37 -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