Chris Tate
1cc416b8a4
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
2015-08-04 01:37:49 +00:00
Chris Tate
deb879cc5b
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
2015-08-04 01:24:13 +00:00
Prem Kumar
881207b035
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.
2015-08-04 01:23:46 +00:00
Maurice Lam
ce08d4d308
am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '36d6d2ff08d5e9bd9ecaa176f6ebea99c7f7db6f':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:23:45 +00:00
Geoff Mendal
109e329bbd
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
2015-08-04 01:23:44 +00: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
Geoff Mendal
28a4f1fdf7
am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit '568c167b3c99f628165c823f1c5b0cacf8a462a2':
Import translations. DO NOT MERGE
2015-08-04 01:17:17 +00:00
Chris Tate
e09bfe34d9
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
2015-08-04 01:15:39 +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
Geoff Mendal
568c167b3c
am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit '8b046c1a4d34873a1e587769fd79f6777836a2a3':
Import translations. DO NOT MERGE
2015-08-04 01:08:47 +00:00
Chris Tate
bd3d49f787
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
2015-08-04 01:06:46 +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
Geoff Mendal
8b046c1a4d
am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c493f0421773fba528494d98e396c34f6815fe7b':
Import translations. DO NOT MERGE
2015-08-04 00:59:53 +00:00
Chris Tate
6e64e22ec7
Merge "Explain properly when apps can open multiple hosts' links" into mnc-dev
2015-08-04 00:56:24 +00:00
Christopher Tate
d485c6b13d
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
2015-08-03 17:46:30 -07: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
1af973b26c
am 69fcacc2: (-s ours) am 7ddac827: (-s ours) am 052e50dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '69fcacc296de831358d6b6f3cdc49ca76df1c61d':
Import translations. DO NOT MERGE
2015-08-03 14:36:55 +00:00
Geoff Mendal
69fcacc296
am 7ddac827: (-s ours) am 052e50dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '7ddac827941c2a4f493b105527eb2728d619f270':
Import translations. DO NOT MERGE
2015-08-03 14:27:30 +00:00
Geoff Mendal
7ddac82794
am 052e50dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '052e50dd7f736a812b032c0348e02e77c0c1f832':
Import translations. DO NOT MERGE
2015-08-03 14:18:20 +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
8655be287d
am c2d8a523: (-s ours) am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c2d8a52393941f7019ce81c3a3a523871bd8680f':
Import translations. DO NOT MERGE
2015-08-01 17:03:47 +00:00
Vinit Deshpande
bce70a1f9b
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
2015-08-01 17:03:46 +00:00
Jim Miller
8ea975c128
am bb89abea: am d0c09c48: am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
...
* commit 'bb89abeaff323762f77fb8ed97dda910cc171fee':
Fix fingerprint enrolling bug.
2015-08-01 17:03:45 +00:00
Maurice Lam
de4a53624f
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
2015-08-01 17:03:44 +00:00
Geoff Mendal
2f0ef73c31
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
2015-08-01 17:03:42 +00:00
Geoff Mendal
c2d8a52393
am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE
...
* commit '5d4bd09d8531141489d2ba2914ad40ef056a1466':
Import translations. DO NOT MERGE
2015-08-01 16:51:51 +00:00
Vinit Deshpande
2fbcdd3479
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
2015-08-01 16:51:49 +00:00
Jim Miller
bb89abeaff
am d0c09c48: am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
...
* commit 'd0c09c48aec75cffc7cbcea1d5e2aa1e90ac7ab7':
Fix fingerprint enrolling bug.
2015-08-01 16:51:48 +00:00
Maurice Lam
e39a99e1d5
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
2015-08-01 16:51:47 +00:00
Geoff Mendal
1435018e4b
am b87bbcfb: (-s ours) am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b87bbcfbd6afd29f10bbf64556267221f5b85a3c':
Import translations. DO NOT MERGE
2015-08-01 16:51:45 +00:00
Geoff Mendal
5d4bd09d85
am bd24631d: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bd24631d2e468119eeab658d434dead4d05f56b7':
Import translations. DO NOT MERGE
2015-08-01 16:38:45 +00:00
Vinit Deshpande
5bfa8d8a77
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
2015-08-01 16:38:12 +00:00
Jim Miller
d0c09c48ae
am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
...
* commit '0a8b6f2b9a1b16831565c932b707c59f2ec36491':
Fix fingerprint enrolling bug.
2015-08-01 16:37:53 +00:00
Maurice Lam
87e9d8acd1
am 9d490b50: am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
...
* commit '9d490b50406387a55dc3976cf3cf14ef09d9f98e':
[Fingerprint] Disable back in setup enrolling screen
2015-08-01 16:34:40 +00:00
Geoff Mendal
b87bbcfbd6
am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bbd703914a81b63e15e32a3530d815298f4a6f8c':
Import translations. DO NOT MERGE
2015-08-01 16:34:39 +00: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
Vinit Deshpande
5acb871c0b
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
2015-08-01 00:35:02 +00:00
Vinit Deshpande
b74c0b2a27
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
2015-08-01 00:26:01 +00: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
Sunil Dutt
48c3656944
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
2015-07-31 17:20:17 -07:00
Jim Miller
0a8b6f2b9a
am efaa19d9: Fix fingerprint enrolling bug.
...
* commit 'efaa19d97d4aba1897357971af4c0991af71dbbd':
Fix fingerprint enrolling bug.
2015-07-31 23:48:15 +00:00
Jim Miller
efaa19d97d
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
2015-07-31 23:17:24 +00:00
Maurice Lam
9d490b5040
am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
...
* commit '88832a3d4d48b94a3c43a6240dff75b5d486681b':
[Fingerprint] Disable back in setup enrolling screen
2015-07-31 19:43:17 +00:00
Geoff Mendal
bbd703914a
am 13cbe053: (-s ours) Import translations. DO NOT MERGE
...
* commit '13cbe05387fe387c88f39f9121a8283121e96bdc':
Import translations. DO NOT MERGE
2015-07-31 19:41:55 +00:00
Maurice Lam
88832a3d4d
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
2015-07-31 18:50:39 +00:00
