Geoff Mendal
093f37469a
Import translations. DO NOT MERGE
...
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
2015-08-05 07:05:39 -07:00
Maurice Lam
311a2d9525
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
2015-08-05 00:38:37 +00:00
Maurice Lam
c781bf30ad
am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit 'e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:35:27 +00:00
Maurice Lam
e8f7ed9ea0
am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:27:22 +00:00
Maurice Lam
2a74b86238
am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:20:06 +00:00
Maurice Lam
8c9136efce
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
2015-08-05 00:09:32 +00:00
Maurice Lam
54a34ac6f9
am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
...
* commit '6eb6f924ac02afa004ea15ccbeecdd16c152b222':
[Fingerprint] Update string for enrolling
2015-08-04 23:43:00 +00:00
Maurice Lam
6eb6f924ac
am c48ea1f5: [Fingerprint] Update string for enrolling
...
* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
[Fingerprint] Update string for enrolling
2015-08-04 23:36:09 +00:00
Maurice Lam
c48ea1f586
[Fingerprint] Update string for enrolling
...
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
2015-08-04 23:08:10 +00:00
Maurice Lam
289151ccea
[Fingerprint] Update string for enrolling
...
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
2015-08-04 15:44:42 -07:00
Maurice Lam
42b6ad595b
[Fingerprint] Shrink fingerprint progress ring
...
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.
Bug: 22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
2015-08-04 15:06:26 -07: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
1adca55ffe
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
2015-08-04 19:45:58 +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
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
bd24631d2e
Import translations. DO NOT MERGE
...
Change-Id: I1d0459c20f362248d4d3b065a2d4f6c653555d7a
Auto-generated-cl: translation import
2015-07-31 20:47:02 -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
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
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
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
18dea40e2d
am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '1b730cb77eb44e9e6938e11fe19522dcd909ec2f':
Adjustments for find sensor screen
2015-07-29 22:39:34 +00:00
