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
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
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
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
222aeaf301
am 18dea40e: am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '18dea40e2d755fbec2f028682c2754be4999183a':
Adjustments for find sensor screen
2015-07-29 22:56:34 +00: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
Geoff Mendal
53f771d821
Import translations. DO NOT MERGE
...
Change-Id: I959a8c52fd330769880fd9b41894e404865a951e
Auto-generated-cl: translation import
2015-07-29 15:31:28 -07:00
Jorim Jaggi
1b730cb77e
am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '434d55e591bfb7cc84fed8d8574624425348a711':
Adjustments for find sensor screen
2015-07-29 22:26:16 +00:00
Jorim Jaggi
434d55e591
am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
Adjustments for find sensor screen
2015-07-29 22:14:09 +00:00
Jorim Jaggi
23ace01340
Merge "Adjustments for find sensor screen" into mnc-dev
2015-07-29 21:58:43 +00:00
Julia Reynolds
89594f520a
am 61bc6b72: am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
...
* commit '61bc6b729b61359c89ed695910fb1774eab9e88a':
Change assist app warning message text
2015-07-29 18:52:51 +00:00
Julia Reynolds
7ae0f3cdf2
am a578d3af: am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit 'a578d3afe839247c24ee805852d7fdf12250607c':
Change 'data' label to 'data usage'.
2015-07-29 18:52:49 +00:00
Julia Reynolds
61bc6b729b
am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
...
* commit '24a1ac3620f8fd983f42d38d24a32b13f74b8cda':
Change assist app warning message text
2015-07-29 18:30:46 +00:00
Julia Reynolds
a578d3afe8
am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '6785be7362a158926e36f0bfe3f721082c9be3f3':
Change 'data' label to 'data usage'.
2015-07-29 18:30:45 +00:00
Julia Reynolds
24a1ac3620
am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
...
* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
Change assist app warning message text
2015-07-29 18:03:57 +00:00
Julia Reynolds
6785be7362
am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '089e9e9a0dc4ad2c87e0ca79c16b6375b9623554':
Change 'data' label to 'data usage'.
2015-07-29 18:03:56 +00:00
Julia Reynolds
c2f62f650a
am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
...
* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
Change assist app warning message text
2015-07-29 17:41:15 +00:00
Julia Reynolds
089e9e9a0d
am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
Change 'data' label to 'data usage'.
2015-07-29 17:41:14 +00:00
Julia Reynolds
00b5488c67
Merge "Change assist app warning message text" into mnc-dev
2015-07-29 17:26:12 +00:00
Julia Reynolds
ae422fd099
Merge "Change 'data' label to 'data usage'." into mnc-dev
2015-07-29 17:25:41 +00:00
Julia Reynolds
ff0e1650d9
Change 'data' label to 'data usage'.
...
Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
2015-07-29 13:15:14 -04:00
Julia Reynolds
5bdf80c868
Change assist app warning message text
...
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
2015-07-29 13:02:09 -04:00
Martijn Coenen
7d49ed8ac2
am 034b6801: am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit '034b6801f4a42522c2493d3f3df2c7596c183de6':
Add contactless symbol to NFC resources.
2015-07-29 14:36:49 +00:00
Martijn Coenen
034b6801f4
am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit 'd93b6412801706311b9389f789ecdf76969695db':
Add contactless symbol to NFC resources.
2015-07-29 14:16:35 +00:00
