Svet Ganov
5329b48404
am a6a440b6: am b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev automerge: 5e1e4ef
...
* commit 'a6a440b69114ec74502c52254059a9c902d4f6d4':
Printing from two apps at the same time not working.
2014-10-25 03:41:48 +00:00
George Mount
8652102d3f
am a618afc0: am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
...
* commit 'a618afc0c76ceefc9a0fb4dd9c1b5f7685e0e84e':
Fix NPE when rejected snapshots are null.
2014-10-25 02:36:40 +00:00
Svetoslav
cd34983dfa
am 89e5035d: am dcf21b96: Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev automerge: 74a4a8d
...
* commit '89e5035da643369b857ebc87d11aa5190b1fb8df':
Enhance computation of click point for accessibility.
2014-10-25 02:36:18 +00:00
Alan Viverette
a7dc89bcfc
am a8aa03ef: Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev automerge: 1ac5266 automerge: 4329ad3
...
* commit 'a8aa03efa7541b1e6144028271a4d1635aeebfac':
Add support for Explore by Touch to RadialTimePickerView
2014-10-25 02:35:39 +00:00
Svet Ganov
a6a440b691
am b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev
...
automerge: 5e1e4ef
* commit '5e1e4ef41917315c46e577ddabb469164c56c515':
Printing from two apps at the same time not working.
2014-10-25 00:51:05 +00:00
Svet Ganov
b32f04b785
Merge "Printing from two apps at the same time not working." into lmp-mr1-dev
2014-10-25 00:16:58 +00:00
Svet Ganov
99a82437ed
Printing from two apps at the same time not working.
...
When printing from two apps at the same time the second print UI is
getting stuck. There were a couple of issues here:
AdapterView was not notifying for item selection if the data changes
after scheduling a dalayed selection notification and the notification
execution. The code assumed that a layout pass will occur and posponed
the notification after the layout pass but it is not guaranteed that
such a layout pass will occur. Now we delay only if a layout pass is
being scheduled.
Also when binding to the PDF rendering service the print spooler was
using the same intent and as a result two print activites were getting
the same renderer instance while they should get separate ones. Now
we use different data in the intent to ensure we get separate renderer
instances.
Change-Id: I6aa7c7b041957804b4273549dd837a6d70064efc
2014-10-24 17:02:32 -07:00
George Mount
a618afc0c7
am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
...
* commit '511452cf4d3cd2669a89abd98658a844b852b5e3':
Fix NPE when rejected snapshots are null.
2014-10-24 23:13:38 +00:00
Svetoslav
89e5035da6
am dcf21b96: Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev automerge: 74a4a8d
...
* commit 'dcf21b968d3bd15f7e917ee585cf2a8dbe1babd5':
Enhance computation of click point for accessibility.
2014-10-24 23:03:25 +00:00
George Mount
b71580c34e
Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
2014-10-24 22:43:45 +00:00
George Mount
83c692efd3
Fix NPE when rejected snapshots are null.
...
Bug 18055705
Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
2014-10-24 15:26:32 -07:00
Svetoslav
74a4a8d616
Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev
2014-10-24 21:57:39 +00:00
Alan Viverette
a8aa03efa7
Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev automerge: 1ac5266
...
automerge: 4329ad3
* commit '4329ad3be8f42b62f54ab070fcd97d2a1bb2d7f3':
Add support for Explore by Touch to RadialTimePickerView
2014-10-24 21:28:34 +00:00
Alan Viverette
1ac52667ee
Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev
2014-10-24 20:36:33 +00:00
Alan Viverette
ffb46bf295
Add support for Explore by Touch to RadialTimePickerView
...
Also adds IntArray, which is like LongArray for integers, and prevents
the AM/PM label text in the time picker header from wrapping.
BUG: 17468036
Change-Id: I7120089885709f23e20368927e4b3ed9db2e5393
2014-10-24 12:06:11 -07:00
Jeff Sharkey
b0baae47e8
am b144b5f1: am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev
...
* commit 'b144b5f1251c74ddbeeea20eecdda9906c76286d':
Allow I/O when installing providers.
2014-10-24 17:52:57 +00:00
Jeff Sharkey
b144b5f125
am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev
...
* commit 'e92bd4c04bcb0d18c0fdae9246f4af06a5aba345':
Allow I/O when installing providers.
2014-10-24 17:48:22 +00:00
Jeff Sharkey
2d87ba630c
Merge "Allow I/O when installing providers." into lmp-mr1-dev
2014-10-24 17:40:30 +00:00
Christoph Studer
aac0c2673b
am 7ffa8dad: am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
...
* commit '7ffa8dad6fc5210bc4b851e458f4a63486604234':
SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:44:15 +00:00
Christoph Studer
7ffa8dad6f
am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
...
* commit 'c10f39d536aebbdd7d6b30ac2dfcfcf6b51772f8':
SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:38:25 +00:00
Christoph Studer
5c1a49651b
Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
2014-10-24 14:29:20 +00:00
Jason Monk
2fb1eec715
am 55606158: am 467f9efe: am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
...
* commit '5560615871e8e1bf3a9c8c6f606319c076fdf03a':
Show screen pinning toasts on all users
2014-10-24 14:10:04 +00:00
Jason Monk
5560615871
am 467f9efe: am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
...
* commit '467f9efe897cccc5deec5ee62fc33133fabe10e1':
Show screen pinning toasts on all users
2014-10-24 14:04:45 +00:00
Jason Monk
104d2484ec
Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
2014-10-24 13:55:55 +00:00
Adrian Roos
8b70c1e29b
am 621823e0: am 53f30ec2: am bcd07652: Add API for querying trusted state
...
* commit '621823e0641b883684e7f9e8c705f0dc69dd02ce':
Add API for querying trusted state
2014-10-24 13:33:30 +00:00
Adrian Roos
621823e064
am 53f30ec2: am bcd07652: Add API for querying trusted state
...
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
Add API for querying trusted state
2014-10-24 13:27:39 +00:00
Adrian Roos
bcd076525c
Add API for querying trusted state
...
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
2014-10-24 13:59:45 +02:00
Narayan Kamath
9c7a0f59c4
am 0d50b5d0: am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev
...
* commit '0d50b5d0ee03ed6e71c105b519d3470dc173cda2':
Deprecate more apache-http.
2014-10-24 10:46:03 +00:00
Yuncheol Heo
d476d4a803
am b10d25fc: am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev
...
* commit 'b10d25fc961c48ee64a545dc394c2ef1cb3fd0d9':
CEC: Fix apilint errors.
2014-10-24 10:45:55 +00:00
Neil Fuller
4400f96d1f
am a021e922: resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp
...
* commit 'a021e922184ee16fc019e29c066719daa793dd2b':
Deprecating FloatMath and Time
2014-10-24 10:41:46 +00:00
Narayan Kamath
0d50b5d0ee
am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev
...
* commit 'e572a77f05948fdc9c17ccdce0784d8b179a03ee':
Deprecate more apache-http.
2014-10-24 10:40:00 +00:00
Yuncheol Heo
b10d25fc96
am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev
...
* commit 'ddb863f42832e5dcc0f5167ce5ba7ecea2d977a4':
CEC: Fix apilint errors.
2014-10-24 10:39:50 +00:00
Neil Fuller
a021e92218
resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
2014-10-24 11:36:46 +01:00
Narayan Kamath
fa36b36c8b
Merge "Deprecate more apache-http." into lmp-mr1-dev
2014-10-24 08:58:45 +00:00
Yuncheol Heo
5b062e07c5
Merge "CEC: Fix apilint errors." into lmp-mr1-dev
2014-10-24 08:48:30 +00:00
Neil Fuller
07ff2f72c8
Merge "Deprecating FloatMath and Time" into lmp-mr1-dev
2014-10-24 08:10:39 +00:00
Yuncheol Heo
2b0da5c4c8
CEC: Fix apilint errors.
...
- Change 'protected' to 'package private'.
- Change '@hide' to '{@hide}' for methods which should be still hidden
for linting.
- Rename addVendorCommandListener to setVendorCommandListener and make sure to be called once.
- Fix the implementation of removeHotplugEventListener().
Bug: 18063669
Change-Id: I5c032736f17bab9518f21596f7adeac2f88ba4c1
2014-10-24 15:30:48 +09:00
Yuncheol Heo
0bc9da311b
am 8991001f: Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518 automerge: f235449
...
* commit '8991001fec08094100113cc5a94cf0d6cbad0f8e':
CEC: Fix JavaDoc errors.
2014-10-24 02:45:59 +00:00
Yuncheol Heo
8991001fec
Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518
...
automerge: f235449
* commit 'f235449efb77f925262cb63e85ab3b197a94d2e5':
CEC: Fix JavaDoc errors.
2014-10-24 02:39:34 +00:00
Svetoslav
8ec648c18f
am eed63916: am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev automerge: 89e7ffe
...
* commit 'eed63916a184b05fa8572c9a8151745d05777740':
APIs for an accessibility service to put interaction tracking overlays.
2014-10-24 02:14:06 +00:00
Svetoslav
eed63916a1
am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev
...
automerge: 89e7ffe
* commit '89e7ffedadd20a3091e72b42f86c500452df193c':
APIs for an accessibility service to put interaction tracking overlays.
2014-10-24 02:04:11 +00:00
Yuncheol Heo
fa7651877f
Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev
2014-10-24 01:50:38 +00:00
Svetoslav
bd6fabe2ae
Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev
2014-10-23 23:17:21 +00:00
Yuncheol Heo
5487ab07c7
CEC: Fix JavaDoc errors.
...
- Removed the link tag to the non-public objects.
Bug: 18063758
Change-Id: I17c79510c184df8a62cde9a6a1d18109c299c15d
2014-10-24 08:16:31 +09:00
George Mount
8bc1ad937b
am 890f20e8: am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev
...
* commit '890f20e8e84e91173edf6890f5bb6da5cd0418d2':
Protect against ImageView changing to a null Drawable during Transition.
2014-10-23 22:18:22 +00:00
Yigit Boyar
ba4814a49c
am ab43570f: am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev
...
* commit 'ab43570f5db770e55a73ccff346b3e922443d126':
Added a generic configuration and theme based cache
2014-10-23 22:18:17 +00:00
John Reck
b19bb9bb5a
am 35447aea: am fed6f4ef: am aca6ccf4: Merge "Improve documentation" into lmp-mr1-dev
...
* commit '35447aeabdb93d75074da6a9cb868500215f89d5':
Improve documentation
2014-10-23 22:18:13 +00:00
Alan Viverette
2d19fa289e
am cccea2b9: am 265f8106: am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev
...
* commit 'cccea2b976ac74c78578d2f22adbb0478c220187':
Swap names for clock delegates so they are correct
2014-10-23 22:18:05 +00:00
George Mount
8132c699b1
am b5742f99: am 941252d3: am 523a129c: Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev
...
* commit 'b5742f997d3179f57c305c940dda35bf2f2aedc4':
Use one method to change bounds in ChangeBounds.
2014-10-23 22:18:00 +00:00
Pavel Zhamaitsiak
7c06f9b5e1
am 34e4dc4b: am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev
...
* commit '34e4dc4b09045c882ad7a30b26d78d787d74c264':
Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
2014-10-23 22:17:52 +00:00