OSDN Git Service
Sanket Padawe [Wed, 5 Aug 2015 20:33:11 +0000 (20:33 +0000)]
am
95a524a4: am
eb04b01b: am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
95a524a4ffd2da1873b9ac023f985afac4691b82':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 20:27:24 +0000 (20:27 +0000)]
am
eb04b01b: am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 20:20:47 +0000 (20:20 +0000)]
am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
ac02e250c1540c85c29e0ae753cb365c155c2968':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]
am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
151612fb0de35fd2fadb096511f108b433100149':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.
Ajay Panicker [Wed, 5 Aug 2015 18:43:17 +0000 (18:43 +0000)]
am
e396c224: am
f1ffec39: am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
e396c2241ff629bcfd60bd3caf3fe2da7637dee6':
Implement Bluetooth settings factory reset (5/5)
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
Ajay Panicker [Wed, 5 Aug 2015 18:26:05 +0000 (18:26 +0000)]
am
f1ffec39: am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
f1ffec39b64d85b361f7814690fd5eec0a176f51':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 18:16:29 +0000 (18:16 +0000)]
am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
1dd985abdc5e2a04cf97b4dce778db89891e5064':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 18:01:14 +0000 (18:01 +0000)]
am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 17:26:03 +0000 (17:26 +0000)]
am
4734d829: am
6be055a8: am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
4734d829cd72acc70f24af88a3780c29d410af2d':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 17:09:10 +0000 (17:09 +0000)]
am
6be055a8: am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
6be055a83dc6a70bbce04774b1725c8696abb1fa':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 17:01:02 +0000 (17:01 +0000)]
am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 16:48:13 +0000 (16:48 +0000)]
am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
Geoff Mendal [Wed, 5 Aug 2015 14:44:44 +0000 (14:44 +0000)]
am
ea1724e2: (-s ours) am
38911d7a: (-s ours) am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
ea1724e2c1a94a061ee1b98fea79d88ae1ae2150':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:38:27 +0000 (14:38 +0000)]
am
38911d7a: (-s ours) am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
38911d7a719483ab5f3a7ea18608774183229091':
Import translations. DO NOT MERGE
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev
Geoff Mendal [Wed, 5 Aug 2015 14:30:37 +0000 (14:30 +0000)]
am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
093f37469ae513c273b5d1ab44793f1041888676':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:05:39 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
Maurice Lam [Wed, 5 Aug 2015 01:11:25 +0000 (01:11 +0000)]
am
944233e2: am
5a079608: am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
944233e2521e3f92af92fe6af8c02780340724a7':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 01:05:42 +0000 (01:05 +0000)]
am
5a079608: am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
5a07960889ca3c393e682c9ca1bbc2dff276ef1d':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:56:58 +0000 (00:56 +0000)]
am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
596a8a3c0ac4e931c52e3f4b391d4d4dca1fdcf6':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:46:11 +0000 (00:46 +0000)]
am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
311a2d952522eb61a513670a32462d22504401b1':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:44:00 +0000 (00:44 +0000)]
am
c781bf30: am
e8f7ed9e: am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
c781bf30ad0a10217fa74dbb5a2f61ab165d8b3f':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:35:27 +0000 (00:35 +0000)]
am
e8f7ed9e: am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:27:22 +0000 (00:27 +0000)]
am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
2a74b8623816b961f3da7f45f080e61067f951e6':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:20:06 +0000 (00:20 +0000)]
am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Tue, 4 Aug 2015 23:47:51 +0000 (23:47 +0000)]
am
54a34ac6: am
6eb6f924: am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
54a34ac6f92577b95fb42ba9c55a230c68f80076':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:43:00 +0000 (23:43 +0000)]
am
6eb6f924: am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
6eb6f924ac02afa004ea15ccbeecdd16c152b222':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:36:09 +0000 (23:36 +0000)]
am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
c48ea1f5864b8f4d58eebd28173cff655193c70a':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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
Ajay Panicker [Wed, 29 Jul 2015 18:39:16 +0000 (11:39 -0700)]
Implement Bluetooth settings factory reset (5/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
Maurice Lam [Tue, 4 Aug 2015 22:05:23 +0000 (15:05 -0700)]
[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
Jason Monk [Tue, 4 Aug 2015 21:03:38 +0000 (21:03 +0000)]
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
Jason Monk [Tue, 4 Aug 2015 20:55:37 +0000 (20:55 +0000)]
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
Jason Monk [Tue, 4 Aug 2015 20:43:01 +0000 (20:43 +0000)]
am
9824c5da: resolved conflicts for merge of
1adca55f to mnc-dr-dev
* commit '
9824c5da1efa9750fb19d477d29875a08289ecf5':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
Jason Monk [Tue, 4 Aug 2015 20:23:32 +0000 (16:23 -0400)]
resolved conflicts for merge of
1adca55f to mnc-dr-dev
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
Nick Kralevich [Tue, 4 Aug 2015 19:45:58 +0000 (19:45 +0000)]
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
Jason Monk [Tue, 4 Aug 2015 19:25:32 +0000 (15:25 -0400)]
Remove summaries fro configure apps page
Bug:
22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
Jason Monk [Tue, 4 Aug 2015 18:14:38 +0000 (18:14 +0000)]
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
Jason Monk [Tue, 4 Aug 2015 18:06:19 +0000 (18:06 +0000)]
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
Jason Monk [Tue, 4 Aug 2015 17:57:14 +0000 (17:57 +0000)]
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
Jason Monk [Tue, 4 Aug 2015 17:44:00 +0000 (17:44 +0000)]
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 14:20:41 +0000 (14:20 +0000)]
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
Jason Monk [Tue, 4 Aug 2015 14:13:38 +0000 (14:13 +0000)]
am
7bed7f04: am
3daefe4c: am
f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit '
7bed7f044311d08b3e602583311317c7e2f09a65':
Make sure accessibility service desc isn't clickable
Jason Monk [Tue, 4 Aug 2015 14:04:19 +0000 (14:04 +0000)]
am
3daefe4c: am
f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit '
3daefe4c94fc2f411f100ba2488322fe9885d362':
Make sure accessibility service desc isn't clickable
Jason Monk [Tue, 4 Aug 2015 13:57:27 +0000 (13:57 +0000)]
am
f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit '
f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
Jason Monk [Tue, 4 Aug 2015 13:44:10 +0000 (09:44 -0400)]
Make sure accessibility service desc isn't clickable
Bug:
21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9
Jason Monk [Wed, 29 Jul 2015 18:53:35 +0000 (14:53 -0400)]
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
Dianne Hackborn [Tue, 4 Aug 2015 01:37:50 +0000 (01:37 +0000)]
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
Chris Tate [Tue, 4 Aug 2015 01:37:49 +0000 (01:37 +0000)]
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
Dianne Hackborn [Tue, 4 Aug 2015 01:24:14 +0000 (01:24 +0000)]
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
Chris Tate [Tue, 4 Aug 2015 01:24:13 +0000 (01:24 +0000)]
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
Prem Kumar [Tue, 4 Aug 2015 01:23:46 +0000 (01:23 +0000)]
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.
Maurice Lam [Tue, 4 Aug 2015 01:23:45 +0000 (01:23 +0000)]
am
36d6d2ff: am
4c55266b: am
0d6e1da5: am
87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '
36d6d2ff08d5e9bd9ecaa176f6ebea99c7f7db6f':
[Fingerprint] Help text for backup screen lock
Geoff Mendal [Tue, 4 Aug 2015 01:23:44 +0000 (01:23 +0000)]
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
Dianne Hackborn [Tue, 4 Aug 2015 01:19:52 +0000 (01:19 +0000)]
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
Prem Kumar [Tue, 4 Aug 2015 01:17:19 +0000 (01:17 +0000)]
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.
Maurice Lam [Tue, 4 Aug 2015 01:17:18 +0000 (01:17 +0000)]
am
4c55266b: am
0d6e1da5: am
87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '
4c55266b168bba7bf2b4c5e33972beb0434135e6':
[Fingerprint] Help text for backup screen lock
Geoff Mendal [Tue, 4 Aug 2015 01:17:17 +0000 (01:17 +0000)]
am
568c167b: (-s ours) am
8b046c1a: (-s ours) am
c493f042: (-s ours) Import translations. DO NOT MERGE
* commit '
568c167b3c99f628165c823f1c5b0cacf8a462a2':
Import translations. DO NOT MERGE
Chris Tate [Tue, 4 Aug 2015 01:15:39 +0000 (01:15 +0000)]
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
Dianne Hackborn [Tue, 4 Aug 2015 01:12:29 +0000 (01:12 +0000)]
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
Prem Kumar [Tue, 4 Aug 2015 01:08:49 +0000 (01:08 +0000)]
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.
Maurice Lam [Tue, 4 Aug 2015 01:08:48 +0000 (01:08 +0000)]
am
0d6e1da5: am
87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '
0d6e1da536e99ad9e141812295e67727f78475f6':
[Fingerprint] Help text for backup screen lock
Geoff Mendal [Tue, 4 Aug 2015 01:08:47 +0000 (01:08 +0000)]
am
8b046c1a: (-s ours) am
c493f042: (-s ours) Import translations. DO NOT MERGE
* commit '
8b046c1a4d34873a1e587769fd79f6777836a2a3':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 4 Aug 2015 01:07:36 +0000 (01:07 +0000)]
Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
Chris Tate [Tue, 4 Aug 2015 01:06:46 +0000 (01:06 +0000)]
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
Prem Kumar [Tue, 4 Aug 2015 01:00:43 +0000 (01:00 +0000)]
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.
Maurice Lam [Tue, 4 Aug 2015 01:00:29 +0000 (01:00 +0000)]
am
87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '
87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
Geoff Mendal [Tue, 4 Aug 2015 00:59:53 +0000 (00:59 +0000)]
am
c493f042: (-s ours) Import translations. DO NOT MERGE
* commit '
c493f0421773fba528494d98e396c34f6815fe7b':
Import translations. DO NOT MERGE
Chris Tate [Tue, 4 Aug 2015 00:56:24 +0000 (00:56 +0000)]
Merge "Explain properly when apps can open multiple hosts' links" into mnc-dev
Christopher Tate [Tue, 4 Aug 2015 00:46:30 +0000 (17:46 -0700)]
Explain properly when apps can open multiple hosts' links
The app link settings "Open by default" detail view was showing
only one host under label "Supported links," improperly implying
that the app would only open that host's links. The summary now
matches the 'App links' view's, explaining "Open $HOST and related
URLs" for apps with more than one.
Tapping on the item has always shown the full list of hosts
advertised by the app, and this remains unchanged.
Bug
22769535
Change-Id: I2be409df64639eb0f2b43a06e3195796c3a3df8b
Prem Kumar [Tue, 4 Aug 2015 00:41:47 +0000 (00:41 +0000)]
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
Dianne Hackborn [Tue, 4 Aug 2015 00:17:10 +0000 (17:17 -0700)]
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
The settings activities that get launched directly by voice now
protect themselves to only execute if they were actually directly
launched by the voice interaction service, rather than allowing
any activity currently under voice control to abuse them.
Note the original code also allowed them to execute regardless of
whether they were running under voice, since it allowed for a null
saved state. I assume that was a mistake, so have removed it.
Change-Id: Ib2269a7ee13016d300afba7fa257bfaca8990fab
Maurice Lam [Mon, 3 Aug 2015 22:33:25 +0000 (15:33 -0700)]
[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
Geoff Mendal [Mon, 3 Aug 2015 22:15:10 +0000 (15:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22847296
Bug:
22816816
Bug:
22644642
Change-Id: Ieddb5bbb9f597eda153f307b62086753dd460e93
Geoff Mendal [Mon, 3 Aug 2015 14:36:55 +0000 (14:36 +0000)]
am
69fcacc2: (-s ours) am
7ddac827: (-s ours) am
052e50dd: (-s ours) Import translations. DO NOT MERGE
* commit '
69fcacc296de831358d6b6f3cdc49ca76df1c61d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Aug 2015 14:27:30 +0000 (14:27 +0000)]
am
7ddac827: (-s ours) am
052e50dd: (-s ours) Import translations. DO NOT MERGE
* commit '
7ddac827941c2a4f493b105527eb2728d619f270':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Aug 2015 14:18:20 +0000 (14:18 +0000)]
am
052e50dd: (-s ours) Import translations. DO NOT MERGE
* commit '
052e50dd7f736a812b032c0348e02e77c0c1f832':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Aug 2015 14:08:05 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a7a4c47fd5d7cb61a2cc319bcfd33867bb234be
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 17:03:47 +0000 (17:03 +0000)]
am
c2d8a523: (-s ours) am
5d4bd09d: (-s ours) am
bd24631d: (-s ours) Import translations. DO NOT MERGE
* commit '
c2d8a52393941f7019ce81c3a3a523871bd8680f':
Import translations. DO NOT MERGE
Vinit Deshpande [Sat, 1 Aug 2015 17:03:46 +0000 (17:03 +0000)]
am
2fbcdd34: am
5bfa8d8a: am
5acb871c: am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
2fbcdd3479df61625d80e9e025352e37cf65cd70':
wifi: Check for the sizeof ssid to start SoftAP
Jim Miller [Sat, 1 Aug 2015 17:03:45 +0000 (17:03 +0000)]
am
bb89abea: am
d0c09c48: am
0a8b6f2b: am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
bb89abeaff323762f77fb8ed97dda910cc171fee':
Fix fingerprint enrolling bug.
Maurice Lam [Sat, 1 Aug 2015 17:03:44 +0000 (17:03 +0000)]
am
e39a99e1: am
87e9d8ac: am
9d490b50: am
88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '
e39a99e1d5b516f95df03befe5797efc94ffc882':
[Fingerprint] Disable back in setup enrolling screen
Geoff Mendal [Sat, 1 Aug 2015 17:03:42 +0000 (17:03 +0000)]
am
1435018e: (-s ours) am
b87bbcfb: (-s ours) am
bbd70391: (-s ours) am
13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '
1435018e4b5f3380b62d4bc2ac022cdb2c2746bd':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 16:51:51 +0000 (16:51 +0000)]
am
5d4bd09d: (-s ours) am
bd24631d: (-s ours) Import translations. DO NOT MERGE
* commit '
5d4bd09d8531141489d2ba2914ad40ef056a1466':
Import translations. DO NOT MERGE
Vinit Deshpande [Sat, 1 Aug 2015 16:51:49 +0000 (16:51 +0000)]
am
5bfa8d8a: am
5acb871c: am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
5bfa8d8a77e04ce9131e6d8406b41f73d2a469ce':
wifi: Check for the sizeof ssid to start SoftAP
Jim Miller [Sat, 1 Aug 2015 16:51:48 +0000 (16:51 +0000)]
am
d0c09c48: am
0a8b6f2b: am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
d0c09c48aec75cffc7cbcea1d5e2aa1e90ac7ab7':
Fix fingerprint enrolling bug.
Maurice Lam [Sat, 1 Aug 2015 16:51:47 +0000 (16:51 +0000)]
am
87e9d8ac: am
9d490b50: am
88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '
87e9d8acd14033839dc1f4f128afc29f089ed8c2':
[Fingerprint] Disable back in setup enrolling screen
Geoff Mendal [Sat, 1 Aug 2015 16:51:45 +0000 (16:51 +0000)]
am
b87bbcfb: (-s ours) am
bbd70391: (-s ours) am
13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '
b87bbcfbd6afd29f10bbf64556267221f5b85a3c':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 16:38:45 +0000 (16:38 +0000)]
am
bd24631d: (-s ours) Import translations. DO NOT MERGE
* commit '
bd24631d2e468119eeab658d434dead4d05f56b7':
Import translations. DO NOT MERGE
Vinit Deshpande [Sat, 1 Aug 2015 16:38:12 +0000 (16:38 +0000)]
am
5acb871c: am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
5acb871c0b7660a63f7b0708b65673a2f63fb165':
wifi: Check for the sizeof ssid to start SoftAP
Jim Miller [Sat, 1 Aug 2015 16:37:53 +0000 (16:37 +0000)]
am
0a8b6f2b: am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
0a8b6f2b9a1b16831565c932b707c59f2ec36491':
Fix fingerprint enrolling bug.
Maurice Lam [Sat, 1 Aug 2015 16:34:40 +0000 (16:34 +0000)]
am
9d490b50: am
88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '
9d490b50406387a55dc3976cf3cf14ef09d9f98e':
[Fingerprint] Disable back in setup enrolling screen
Geoff Mendal [Sat, 1 Aug 2015 16:34:39 +0000 (16:34 +0000)]
am
bbd70391: (-s ours) am
13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '
bbd703914a81b63e15e32a3530d815298f4a6f8c':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 03:47:02 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d0459c20f362248d4d3b065a2d4f6c653555d7a
Auto-generated-cl: translation import