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
, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.
Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.
Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
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
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
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
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
Geoff Mendal
fe6fc96a59
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-29 13:59:28 +00:00
Geoff Mendal
a497606a49
Import translations. DO NOT MERGE
...
Change-Id: Ic5113dd5d45744811ac6ca45f037333b7f659362
Auto-generated-cl: translation import
2015-07-29 06:56:59 -07:00
Martijn Coenen
d93b641280
am 3c975a9f
: am edb2668c
: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit '3c975a9fc15c39077613ce741e71fa2baf789492':
Add contactless symbol to NFC resources.
2015-07-29 13:55:08 +00:00
Martijn Coenen
3c975a9fc1
am edb2668c
: Merge "Add contactless symbol to NFC resources." into mnc-dev
...
* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
Add contactless symbol to NFC resources.
2015-07-29 13:34:38 +00:00
Martijn Coenen
edb2668c6d
Merge "Add contactless symbol to NFC resources." into mnc-dev
2015-07-29 13:21:40 +00:00
Julia Reynolds
826400bdbb
am f2d5e02c
: am 39768c86
: am f889faaf
: Merge "Bump string char limit." into mnc-dev
...
* commit 'f2d5e02c4d9334545247e437712f4407e97f84ca':
Bump string char limit.
2015-07-29 13:20:33 +00:00
Julia Reynolds
f2d5e02c4d
am 39768c86
: am f889faaf
: Merge "Bump string char limit." into mnc-dev
...
* commit '39768c86af48e26717110814f2f208e64e854331':
Bump string char limit.
2015-07-29 13:00:24 +00:00
Julia Reynolds
39768c86af
am f889faaf
: Merge "Bump string char limit." into mnc-dev
...
* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
Bump string char limit.
2015-07-29 12:39:11 +00:00
Julia Reynolds
f889faaf08
Merge "Bump string char limit." into mnc-dev
2015-07-29 12:25:28 +00:00
Martijn Coenen
120ed35243
am b0390ed0
: am de661d5b
: am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit 'b0390ed0e57af73a2ee6a692598fe8dd28748d72':
Fix tap & pay strings.
2015-07-29 10:27:36 +00:00
Martijn Coenen
b0390ed0e5
am de661d5b
: am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
Fix tap & pay strings.
2015-07-29 10:06:07 +00:00
Martijn Coenen
927369befd
Add contactless symbol to NFC resources.
...
Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431
2015-07-29 10:10:35 +02:00
Martijn Coenen
de661d5b15
am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
Fix tap & pay strings.
2015-07-29 08:10:14 +00:00
Martijn Coenen
8e7b9cf9f6
Merge "Fix tap & pay strings." into mnc-dev
2015-07-29 07:54:04 +00:00
Jorim Jaggi
aa587b39b6
Adjustments for find sensor screen
...
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
2015-07-28 23:58:56 +00:00