OSDN Git Service
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
Vinit Deshpande [Sat, 1 Aug 2015 00:35:02 +0000 (00:35 +0000)]
am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
wifi: Check for the sizeof ssid to start SoftAP
Vinit Deshpande [Sat, 1 Aug 2015 00:26:01 +0000 (00:26 +0000)]
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
Sanket Padawe [Sat, 1 Aug 2015 00:22:45 +0000 (17:22 -0700)]
Allow Contact sharing by default while connecting Car Kit.
Bug:
22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
Sunil Dutt [Thu, 2 Jul 2015 09:58:58 +0000 (15:28 +0530)]
wifi: Check for the sizeof ssid to start SoftAP
Disable the option to start SoftAP if ssid byte length is over 32 bytes.
Bug:
22074821
Change-Id: I696dca1aac8673bff168481fde4b013450bac72c
Jim Miller [Fri, 31 Jul 2015 23:48:15 +0000 (23:48 +0000)]
am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
efaa19d97d4aba1897357971af4c0991af71dbbd':
Fix fingerprint enrolling bug.
Jim Miller [Fri, 31 Jul 2015 21:05:25 +0000 (14:05 -0700)]
Fix fingerprint enrolling bug.
This fixes a bug where rotating the device would call post_enroll()
too early, thus invalidating the current session.
Fixes bug
22708390
Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011
Maurice Lam [Fri, 31 Jul 2015 19:43:17 +0000 (19:43 +0000)]
am
88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '
88832a3d4d48b94a3c43a6240dff75b5d486681b':
[Fingerprint] Disable back in setup enrolling screen
Geoff Mendal [Fri, 31 Jul 2015 19:41:55 +0000 (19:41 +0000)]
am
13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '
13cbe05387fe387c88f39f9121a8283121e96bdc':
Import translations. DO NOT MERGE
Maurice Lam [Fri, 31 Jul 2015 18:50:39 +0000 (18:50 +0000)]
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
Geoff Mendal [Fri, 31 Jul 2015 16:34:46 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011
Jeff Sharkey [Fri, 31 Jul 2015 02:07:36 +0000 (02:07 +0000)]
am
709ad25c: am
7c59a133: am
b456493a: am
c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '
709ad25c7393ee54552240702878bd78bdd8cb97':
Let Settings measure transient free space.
Jeff Sharkey [Fri, 31 Jul 2015 02:03:37 +0000 (02:03 +0000)]
am
7c59a133: am
b456493a: am
c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '
7c59a133efe64c2a34f5a5743c67076f7a9e4a1e':
Let Settings measure transient free space.
Jeff Sharkey [Fri, 31 Jul 2015 01:57:38 +0000 (01:57 +0000)]
am
b456493a: am
c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '
b456493ad5097dd3713649deeb8452e498c55ea9':
Let Settings measure transient free space.
Jeff Sharkey [Fri, 31 Jul 2015 01:51:31 +0000 (01:51 +0000)]
am
c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '
c7e59e52b45b66de74597a455023dd9fe4e07b3b':
Let Settings measure transient free space.
Jeff Sharkey [Fri, 31 Jul 2015 01:46:44 +0000 (01:46 +0000)]
Merge "Let Settings measure transient free space." into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 01:09:13 +0000 (01:09 +0000)]
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
Maurice Lam [Fri, 31 Jul 2015 01:01:18 +0000 (01:01 +0000)]
am
e2d4c5e8: am
09840984: am
997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '
e2d4c5e8cce1f867db924fdfe737e51774c9109f':
[Fingerprint] Advertise wake & unlock during SUW
Maurice Lam [Fri, 31 Jul 2015 00:55:16 +0000 (00:55 +0000)]
am
09840984: am
997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '
09840984e317c12d3ead3b1d16c65844f363e8c5':
[Fingerprint] Advertise wake & unlock during SUW
Jeff Sharkey [Thu, 30 Jul 2015 23:55:42 +0000 (16:55 -0700)]
Let Settings measure transient free space.
Transient volumes like USB drives are only mounted at /mnt/media_rw,
but they still appear in Settings > Storage. To show stats like
free/used space, give Settings the permissions it needs to access
devices mounted there.
Bug:
22545248
Change-Id: I50be38f02f7d2bfe51d1ac0f76a04c340a21f936
Maurice Lam [Fri, 31 Jul 2015 00:48:43 +0000 (00:48 +0000)]
am
997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '
997bcaa7d8486814540d8bcf1269918d8c48d960':
[Fingerprint] Advertise wake & unlock during SUW
Maurice Lam [Fri, 31 Jul 2015 00:43:58 +0000 (00:43 +0000)]
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
Maurice Lam [Thu, 30 Jul 2015 22:07:58 +0000 (15:07 -0700)]
[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
Geoff Mendal [Thu, 30 Jul 2015 23:28:47 +0000 (23:28 +0000)]
am
109ba8ed: (-s ours) am
dc3e92c2: (-s ours) am
d5974497: (-s ours) am
6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '
109ba8ed33d25102af265c76b339803a25da0456':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 23:20:35 +0000 (23:20 +0000)]
am
dc3e92c2: (-s ours) am
d5974497: (-s ours) am
6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '
dc3e92c24de06d49a1e62aa73ff1269966efb026':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 23:16:06 +0000 (23:16 +0000)]
am
d5974497: (-s ours) am
6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '
d5974497caa856fbeb18e482ca0b427873327356':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 23:10:36 +0000 (23:10 +0000)]
am
6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '
6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 22:54:40 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1
Fyodor Kupolov [Thu, 30 Jul 2015 21:21:14 +0000 (21:21 +0000)]
am
3a3f495e: am
23d4ebdc: am
74f8cb9c: am
c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
3a3f495e2480235a83fdd9c7efe6810f003504bc':
Added android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Thu, 30 Jul 2015 21:09:09 +0000 (21:09 +0000)]
am
23d4ebdc: am
74f8cb9c: am
c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
23d4ebdcccb6a8d030a744b4ae85907b65edc6f3':
Added android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Thu, 30 Jul 2015 21:01:20 +0000 (21:01 +0000)]
am
74f8cb9c: am
c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
74f8cb9c9bf2c354a17ce155977dc9d8bead000a':
Added android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Thu, 30 Jul 2015 20:54:10 +0000 (20:54 +0000)]
am
c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
c3067882dbf00e424cd146181cf15f33ecb9f8f8':
Added android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Thu, 30 Jul 2015 20:50:03 +0000 (20:50 +0000)]
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Jorim Jaggi [Thu, 30 Jul 2015 20:44:08 +0000 (20:44 +0000)]
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
Jorim Jaggi [Thu, 30 Jul 2015 20:37:34 +0000 (20:37 +0000)]
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
Maurice Lam [Thu, 30 Jul 2015 20:29:20 +0000 (13:29 -0700)]
[Fingerprint] Disable back in setup enrolling screen
Disable the back button because the back stack behavior is confusing.
Instead of going back to the screen the user previously saw, pressing
back in enrolling screen goes back to FindSensor.
Bug:
22848016
Change-Id: I71852eb1974f1542fb519bf8bbfdce12de62e66b
Jorim Jaggi [Thu, 30 Jul 2015 20:28:59 +0000 (20:28 +0000)]
am
80d5c931: am
92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
* commit '
80d5c9313d48a49d5216ab3a65ac88e1cb3b9c18':
Add dialog to confirm last fingerprint removal
Jorim Jaggi [Thu, 30 Jul 2015 20:22:14 +0000 (20:22 +0000)]
am
92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
* commit '
92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
Add dialog to confirm last fingerprint removal
Jorim Jaggi [Thu, 30 Jul 2015 20:16:08 +0000 (20:16 +0000)]
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 19:53:58 +0000 (19:53 +0000)]
am
600cfe2f: am
a61c803e: am
7f3026c3: am
bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '
600cfe2f67b8272be53a20dc1fb5690050b515d9':
Refresh after clearing, tweak warn threshold.
Jeff Sharkey [Thu, 30 Jul 2015 19:47:44 +0000 (19:47 +0000)]
am
a61c803e: am
7f3026c3: am
bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '
a61c803ed3c9f815a35f53ebccb6b9e7cc6d86b2':
Refresh after clearing, tweak warn threshold.
Jorim Jaggi [Thu, 30 Jul 2015 19:41:42 +0000 (12:41 -0700)]
Add dialog to confirm last fingerprint removal
Bug:
22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
Jeff Sharkey [Thu, 30 Jul 2015 19:38:48 +0000 (19:38 +0000)]
am
7f3026c3: am
bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '
7f3026c3ca5f8e265da0904f81d899408527c142':
Refresh after clearing, tweak warn threshold.
Jeff Sharkey [Thu, 30 Jul 2015 19:32:36 +0000 (19:32 +0000)]
am
bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '
bb9d6b906e564c9f685834bb7dcccfbe0aa87a29':
Refresh after clearing, tweak warn threshold.
OSDN Git Service
