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
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
d30e426976
Add setting to disable camera gesture
...
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
2015-08-04 11:30:50 -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
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
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
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
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
Prem Kumar
b0d10e796f
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 01:00:43 +00:00
Maurice Lam
0d6e1da536
am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:00:29 +00:00
Prem Kumar
eed361bbaf
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
2015-08-04 00:41:47 +00:00
Maurice Lam
87fadbe6d9
[Fingerprint] Help text for backup screen lock
...
Show a help text saying "Choose your backup screen lock method" when
asking the user for backup screen lock during fingerprint enrollment.
A backup translation is specified, using the source string "Set up your
backup screen lock method".
Bug: 22879473
Change-Id: I9b9348141227103e695d1fc78601745cac0309a7
2015-08-03 23:12:09 +00:00
Geoff Mendal
c493f04217
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22847296
Bug: 22816816
Bug: 22644642
Change-Id: Ieddb5bbb9f597eda153f307b62086753dd460e93
2015-08-03 22:16:52 +00:00
Geoff Mendal
052e50dd7f
Import translations. DO NOT MERGE
...
Change-Id: I4a7a4c47fd5d7cb61a2cc319bcfd33867bb234be
Auto-generated-cl: translation import
2015-08-03 07:08:05 -07:00
Geoff Mendal
6bf18266b4
Import translations. DO NOT MERGE
...
Change-Id: I77ac48aaaf867927d9709c4baf28beabdfc6a98d
Auto-generated-cl: translation import
2015-08-03 06:16:23 -07:00
Geoff Mendal
bd24631d2e
Import translations. DO NOT MERGE
...
Change-Id: I1d0459c20f362248d4d3b065a2d4f6c653555d7a
Auto-generated-cl: translation import
2015-07-31 20:47:02 -07:00
Geoff Mendal
b4d1588aed
Import translations. DO NOT MERGE
...
Change-Id: Iba51a7174b4af5f27ce1831fd0ccefcbb1ff2794
Auto-generated-cl: translation import
2015-07-31 19:56:54 -07:00
Sanket Padawe
a7a4a5a2cf
Allow Contact sharing by default while connecting Car Kit.
...
Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
2015-07-31 17:22:45 -07:00
Geoff Mendal
13cbe05387
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011
2015-07-31 09:34:46 -07:00
Maurice Lam
0ae9cfcff8
am 824bcec9: am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '824bcec98d86a406bb90ca031e359d392f9f6ba9':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:15:16 +00:00
Maurice Lam
824bcec98d
am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '0d1f08cb79b0de41a8c1c13332e2a01ed409e2a2':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:09:13 +00:00
Maurice Lam
0d1f08cb79
am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit 'e2d4c5e8cce1f867db924fdfe737e51774c9109f':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:01:18 +00:00
Maurice Lam
e2d4c5e8cc
am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '09840984e317c12d3ead3b1d16c65844f363e8c5':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:55:16 +00:00
Maurice Lam
09840984e3
am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:48:43 +00:00
Maurice Lam
997bcaa7d8
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
2015-07-31 00:43:58 +00:00
Maurice Lam
5656314aca
[Fingerprint] Advertise wake & unlock during SUW
...
Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.
Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
2015-07-30 17:02:26 -07:00
Nick Kralevich
8a9b03f746
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
...
In ec323a0849
2015-07-30 16:34:01 -07:00
Geoff Mendal
6b0a2d21e6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1
2015-07-30 15:54:40 -07:00
Jorim Jaggi
2181b3d310
am ba3c4ba2: am 02a2be35: am d9eae869: am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit 'ba3c4ba235a1f13e804faed7911c3033997d4ad2':
Add dialog to confirm last fingerprint removal
2015-07-30 20:50:04 +00:00
Jorim Jaggi
ba3c4ba235
am 02a2be35: am d9eae869: am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '02a2be35c7dd71690693a35fb99340dc124d9a3a':
Add dialog to confirm last fingerprint removal
2015-07-30 20:44:08 +00:00
Jorim Jaggi
02a2be35c7
am d9eae869: am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit 'd9eae869751a245df367e812010b84d13d2bf3e0':
Add dialog to confirm last fingerprint removal
2015-07-30 20:37:34 +00:00
Jorim Jaggi
d9eae86975
am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '80d5c9313d48a49d5216ab3a65ac88e1cb3b9c18':
Add dialog to confirm last fingerprint removal
2015-07-30 20:28:59 +00:00
Jorim Jaggi
80d5c9313d
am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
Add dialog to confirm last fingerprint removal
2015-07-30 20:22:14 +00:00
Jorim Jaggi
92f9bdc6ec
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
2015-07-30 20:16:08 +00:00
Jorim Jaggi
12ee807c1f
Add dialog to confirm last fingerprint removal
...
Bug: 22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
2015-07-30 12:42:08 -07:00
Jason Monk
92ec7b4e23
am d7c4c89f: am e05b10fd: am e520015e: am bebcdd0c: am 19128bd1: Extend char limit by small amount
...
* commit 'd7c4c89f5efb39ce8bf9f2f38ff2b7905508b3f2':
Extend char limit by small amount
2015-07-30 16:59:56 +00:00
Jason Monk
d7c4c89f5e
am e05b10fd: am e520015e: am bebcdd0c: am 19128bd1: Extend char limit by small amount
...
* commit 'e05b10fdb2c09ca786195a125b8aa64189596c9e':
Extend char limit by small amount
2015-07-30 16:52:12 +00:00
Jason Monk
e05b10fdb2
am e520015e: am bebcdd0c: am 19128bd1: Extend char limit by small amount
...
* commit 'e520015efa55b02938c8f1bafb5e45313c057dd1':
Extend char limit by small amount
2015-07-30 15:54:36 +00:00
Jason Monk
e520015efa
am bebcdd0c: am 19128bd1: Extend char limit by small amount
...
* commit 'bebcdd0cb0405c03a72fe55bc4b198877a4f1516':
Extend char limit by small amount
2015-07-30 15:39:44 +00:00
Jason Monk
bebcdd0cb0
am 19128bd1: Extend char limit by small amount
...
* commit '19128bd1679cfcad3e38a447dd4584fa5280920f':
Extend char limit by small amount
2015-07-30 15:22:41 +00:00
Jason Monk
19128bd167
Extend char limit by small amount
...
Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23
2015-07-30 11:05:09 -04:00
Geoff Mendal
597d75eaad
Import translations. DO NOT MERGE
...
Change-Id: I7da1ba23b887e9ad682d65e57cc42d7a63c2caef
Auto-generated-cl: translation import
2015-07-30 05:35:46 -07:00
Jorim Jaggi
f8bb7c89d8
am 222aeaf3: am 18dea40e: am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '222aeaf301061bf0cc24b3400dadec1e1791ec80':
Adjustments for find sensor screen
2015-07-29 23:09:40 +00:00
