Jason Monk
b3e81e1004
am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:10:14 +00:00
Jason Monk
183fcd5370
am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:03:38 +00:00
Jason Monk
ddb2277810
am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
* commit 'bd776a0bb70b1956e3b7332fb75378df85b04a60':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 20:55:37 +00:00
Jason Monk
bd776a0bb7
am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 20:43:01 +00:00
Jason Monk
9824c5da1e
resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04:00
Nick Kralevich
8a85dcc9b4
am 1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
...
* commit '1adca55ffe10f1741e5fb75bf0e7530ca200d712':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 19:52:44 +00:00
Nick Kralevich
1adca55ffe
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
2015-08-04 19:45:58 +00:00
Jason Monk
c5291b87b3
Remove summaries fro configure apps page
...
Bug: 22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
2015-08-04 15:25:32 -04:00
Jason Monk
5d402d59bc
am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
Update USB dialog for USB-C power option
2015-08-04 18:23:57 +00:00
Jason Monk
9390333c84
am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit 'd2af08595073f92eb54d6c08f6d896309b5270d9':
Update USB dialog for USB-C power option
2015-08-04 18:14:38 +00:00
Jason Monk
d2af085950
am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '661d1b778828b79851b9ab7fb5d73cf8d3044aa8':
Update USB dialog for USB-C power option
2015-08-04 18:06:19 +00:00
Jason Monk
661d1b7788
am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '2e3775b9b143311da66b91c6f1291a4639236d07':
Update USB dialog for USB-C power option
2015-08-04 17:57:14 +00:00
Jason Monk
2e3775b9b1
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
2015-08-04 17:44:00 +00:00
Jason Monk
d30e426976
Add setting to disable camera gesture
...
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
2015-08-04 11:30:50 -04:00
Jason Monk
4137396ac3
am a4152146: am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit 'a41521465e88a2c29d6e41b735ed4593c3531c8c':
Make sure accessibility service desc isn't clickable
2015-08-04 14:26:43 +00:00
Jason Monk
a41521465e
am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit '92f7b48eb78dd4723cf3d65c163da9498e7ad936':
Make sure accessibility service desc isn't clickable
2015-08-04 14:20:41 +00:00
Jason Monk
92f7b48eb7
am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit '7bed7f044311d08b3e602583311317c7e2f09a65':
Make sure accessibility service desc isn't clickable
2015-08-04 14:13:38 +00:00
Jason Monk
7bed7f0443
am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit '3daefe4c94fc2f411f100ba2488322fe9885d362':
Make sure accessibility service desc isn't clickable
2015-08-04 14:04:19 +00:00
Jason Monk
3daefe4c94
am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
2015-08-04 13:57:27 +00:00
Jason Monk
25adfb004d
am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
2015-08-04 13:55:14 +00:00
Jason Monk
f61ead7ad6
Make sure accessibility service desc isn't clickable
...
Bug: 21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9
2015-08-04 09:44:10 -04:00
Jason Monk
83290eef8c
Update USB dialog for USB-C power option
...
Also includes a bit of visual updates, options now have summaries
as well.
Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.
Currently devices don't have USB-C ports, they can be simulated
with the following commands:
$ adb shell dumpsys usb add-port "matrix" dual
# ?s control whether these can be changed
$ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
# Do testing here
$ adb shell dumpsys usb disconnect-port "matrix"
$ adb shell dumpsys usb remove-port "matrix"
$ adb shell dumpsys usb reset
# Use the help for more info
$ adb shell dumpsys usb -h
Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
2015-08-04 09:18:57 -04:00
Dianne Hackborn
a3903ad006
am bd3119cc: am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'bd3119ccb443a53362cb5325854aa2392b0c043e':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 04:55:10 +00:00
Chris Tate
57c4ddcb15
am 1cc416b8: am deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '1cc416b8a4bf64d13a07a69a263e6d41f84f3f80':
Explain properly when apps can open multiple hosts' links
2015-08-04 04:55:09 +00:00
Dianne Hackborn
50cb6411fa
am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 03:10:35 +00:00
Chris Tate
5977cfdf91
am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '6e64e22ec72ac3adfb530f57925e1d4fe1c332dc':
Explain properly when apps can open multiple hosts' links
2015-08-04 03:10:34 +00:00
Prem Kumar
0694de9397
am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'eed361bbafc079adb2a33eccee2f0a71d872ad54':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 03:10:26 +00:00
Maurice Lam
01495108f1
am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
2015-08-04 03:10:07 +00:00
Geoff Mendal
a5af13758a
am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c493f0421773fba528494d98e396c34f6815fe7b':
Import translations. DO NOT MERGE
2015-08-04 03:09:17 +00:00
Dianne Hackborn
bd3119ccb4
am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit '437c0d2547b089f413a04a0e414ff7cf6c251def':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:37:50 +00:00
Chris Tate
1cc416b8a4
am deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'deb879cc5bccb0bad7d49595db9b704520c621ac':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:37:49 +00:00
Prem Kumar
cba797450c
am 881207b0: am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit '881207b035a47fe5c698b4a99e28325ffa787f74':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:33:19 +00:00
Maurice Lam
24628cbfeb
am ce08d4d3: am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit 'ce08d4d30811e251a2437f13ecb6bdfc00e179c4':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:33:18 +00:00
Geoff Mendal
7865406aab
am 109e329b: (-s ours) am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit '109e329bbd43aadfa921fa8d34089099b5a7d233':
Import translations. DO NOT MERGE
2015-08-04 01:33:17 +00:00
Dianne Hackborn
437c0d2547
am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'a180141e329371b947771b907cb7cbc60b628fe8':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:24:14 +00:00
Chris Tate
deb879cc5b
am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'e09bfe34d985320bea7e9b924dd0910cf639fa33':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:24:13 +00:00
Prem Kumar
881207b035
am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'a2ef9256a102b9610118aede3b5142c8fe047f88':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:23:46 +00:00
Maurice Lam
ce08d4d308
am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '36d6d2ff08d5e9bd9ecaa176f6ebea99c7f7db6f':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:23:45 +00:00
Geoff Mendal
109e329bbd
am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit '28a4f1fdf7eefd0ad134d0a4caccdb0d61d07ddb':
Import translations. DO NOT MERGE
2015-08-04 01:23:44 +00:00
Dianne Hackborn
a180141e32
am e86b170d: am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'e86b170d7faf32d0677122c7273545a0144cc438':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:19:52 +00:00
Prem Kumar
a2ef9256a1
am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit '21adfeebc27869c0b17def319f08a514d325afa3':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:17:19 +00:00
Maurice Lam
36d6d2ff08
am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '4c55266b168bba7bf2b4c5e33972beb0434135e6':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:17:18 +00:00
Geoff Mendal
28a4f1fdf7
am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit '568c167b3c99f628165c823f1c5b0cacf8a462a2':
Import translations. DO NOT MERGE
2015-08-04 01:17:17 +00:00
Chris Tate
e09bfe34d9
am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'bd3d49f78712b12db99ef316e8ec42eb94ea0f06':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:15:39 +00:00
Dianne Hackborn
e86b170d7f
am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:12:29 +00:00
Prem Kumar
21adfeebc2
am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'b0d10e796f1de43c6db2dba5315d21362a26cbfc':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:08:49 +00:00
Maurice Lam
4c55266b16
am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '0d6e1da536e99ad9e141812295e67727f78475f6':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:08:48 +00:00
Geoff Mendal
568c167b3c
am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit '8b046c1a4d34873a1e587769fd79f6777836a2a3':
Import translations. DO NOT MERGE
2015-08-04 01:08:47 +00:00
Dianne Hackborn
f426126a76
Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
2015-08-04 01:07:36 +00:00
Chris Tate
bd3d49f787
am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '6e64e22ec72ac3adfb530f57925e1d4fe1c332dc':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:06:46 +00:00