Udam Saini
4b796fa7d8
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
2016-02-10 21:36:55 +00:00
Sudheer Shanka
28eab080ca
Disable clear credential option when disallowed by admin.
...
Bug: 27119114
Change-Id: I0f60880b125149cd1a9aa5f4e9a5340f49042367
2016-02-10 21:35:54 +00:00
mariagpuyol
1c9b3d5b5f
Modify emergency info subtitle
...
Change-Id: Iaa2ba23a1c0a74552e0f9b71d1e45711126a711c
2016-02-10 13:24:38 -08:00
Udam Saini
f21335c6f0
Fixes showing learn more screen from fingerprint intro page
...
bug:27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f
2016-02-10 12:04:50 -08:00
Anna Galusza
bfdee58b89
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
...
am: 335a958b57
2016-02-10 18:07:06 +00:00
Jason Monk
24f6a0eebc
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
...
am: db26d19302
2016-02-10 18:06:56 +00:00
Udam Saini
ab242afe1e
Merge "Reworks lock screen flows." into nyc-dev
...
am: 779fdcca29
2016-02-10 18:06:47 +00:00
Anna Galusza
335a958b57
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
2016-02-10 17:59:08 +00:00
Jason Monk
db26d19302
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
2016-02-10 17:57:28 +00:00
Jason Monk
30e9fc870f
Fix activity weirdness by doing the right thing
...
Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
2016-02-10 12:55:37 -05:00
Udam Saini
779fdcca29
Merge "Reworks lock screen flows." into nyc-dev
2016-02-10 17:54:58 +00:00
Geoff Mendal
94e5168daf
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 51d56dc14e
2016-02-10 16:46:05 +00:00
Geoff Mendal
51d56dc14e
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-10 16:43:32 +00:00
Geoff Mendal
e42e2fe251
Import translations. DO NOT MERGE
...
Change-Id: I0cab1d68ca64567f0755574a37c2f1e52c45abca
Auto-generated-cl: translation import
2016-02-10 07:48:36 -08:00
Geoff Mendal
963ed1b38d
Import translations. DO NOT MERGE am: a27cd9d033 -s ours
...
am: 029c196bf6
2016-02-10 15:47:06 +00:00
Geoff Mendal
029c196bf6
Import translations. DO NOT MERGE
...
am: a27cd9d033
2016-02-10 15:43:33 +00:00
Geoff Mendal
a27cd9d033
Import translations. DO NOT MERGE
...
Change-Id: I2c4a21fdb89a240803d39cc929c34ea89686ff4f
Auto-generated-cl: translation import
2016-02-10 07:23:28 -08:00
Jeremy Klein
99888fe540
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
...
am: d119f50314
2016-02-10 02:41:12 +00:00
Jeremy Klein
d119f50314
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
2016-02-10 02:40:05 +00:00
Andre Eisenbach
42aeccb95e
Add Developer menu entry to disable Bluetooth absolute volume
...
am: 591c6c4f5a
2016-02-10 02:13:20 +00:00
Andre Eisenbach
591c6c4f5a
Add Developer menu entry to disable Bluetooth absolute volume
...
NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .
Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
2016-02-10 01:54:55 +00:00
Andre Eisenbach
37561b0e3c
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
...
am: 6979c8bbe3
2016-02-09 23:55:04 +00:00
Jim Miller
6f5c588e5b
Fix crash in Settings on devices without fingerprint.
...
am: 017bdceeb4
2016-02-09 23:39:55 +00:00
Jeremy Klein
5ebff810ff
Remove PM query for silent provisioning BroadcastReceiver.
...
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
(cherry picked from commit f19aa5574b
2016-02-09 23:28:47 +00:00
Jim Miller
017bdceeb4
Fix crash in Settings on devices without fingerprint.
...
Fixes bug 27060816
Change-Id: I3b45d3bfa6e47abb4a43ca95c15fd3614f9478dd
2016-02-09 15:15:32 -08:00
Andre Eisenbach
6979c8bbe3
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
2016-02-09 21:20:04 +00:00
Udam Saini
8ef4c62003
Reworks lock screen flows.
...
This also adds frp warning dialogs in case the user skips lock
screen setup initially.
bug:26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c
2016-02-09 11:58:12 -08:00
Udam Saini
d36f4e2be2
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
...
am: 40f4bf2a1f
2016-02-09 18:50:39 +00:00
Udam Saini
40f4bf2a1f
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
2016-02-09 18:47:13 +00:00
Udam Saini
6de85e80a9
Adds the headers for choose lock generic inside onCreate
...
This will make sure the headers are set before the underlying
RecyclerView has made its first layout, and prevents an animation
from playing when rotating to landscape.
bug:26990364
Change-Id: I2838a07a145b4d6136e88125ab955006d84d135c
2016-02-09 10:32:56 -08:00
Samuel Tan
711b01b80d
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920
...
am: aedb058e1b
2016-02-09 18:29:47 +00:00
Samuel Tan
aedb058e1b
Allow trusted system certificates to be used in EAP network configs
...
am: 2b16cd3920
2016-02-09 18:24:20 +00:00
Anna Galusza
132e0784eb
Change style of Preview screens (dark borders with "preview" on the bottom).
...
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
(cherry picked from commit 206a845710
2016-02-09 08:48:14 -08:00
Andre Eisenbach
bbf4f66143
Add Developer menu entry to disable Bluetooth absolute volume
...
Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
2016-02-08 17:20:07 -08:00
Tony Mantler
2eef414b1d
Merge "Fix security level display" into nyc-dev
...
am: b42b9045e2
2016-02-08 22:34:50 +00:00
Anna Galusza
85657bc86c
Update strings for A11y SUW.
...
am: 0239f95538
2016-02-08 22:34:24 +00:00
Tony Mantler
b42b9045e2
Merge "Fix security level display" into nyc-dev
2016-02-08 22:05:08 +00:00
Tony Mantler
3cf07c849b
Fix security level display
...
b/26979319
Change-Id: I049a7f8f7c7917fdc2739234077247116dd8159d
2016-02-08 14:02:05 -08:00
Anna Galusza
0239f95538
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 21:44:13 +00:00
Jim Miller
d15761a95f
Fix crash in ConfirmCredentials due to missing fp service.
...
am: 5947d3517d
2016-02-08 20:40:40 +00:00
Jim Miller
5947d3517d
Fix crash in ConfirmCredentials due to missing fp service.
...
Fixes bug 27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit 0918e5d650
2016-02-08 20:31:49 +00:00
Geoff Mendal
1319d058e5
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 0f6b093db7
2016-02-08 19:02:24 +00:00
Geoff Mendal
0f6b093db7
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-08 16:57:24 +00:00
Geoff Mendal
582bc62a3d
Import translations. DO NOT MERGE
...
Change-Id: I25c554e30994fb003e43d31e54166ee29e8d5bf6
Auto-generated-cl: translation import
2016-02-08 17:55:50 +01:00
Samuel Tan
2b16cd3920
Allow trusted system certificates to be used in EAP network configs
...
Add an option to the "CA certificate" field of the EAP network
configuration menu, "Use system certificates". Choosing this option
will cause the trusted, pre-installed, system CA certificates
to be used to validate EAP servers during the authentication process.
This only applies to EAP-TLS, EAP-TTLS, and EAP-PEAP network
configurations, where the CA certificate option is available.
If the user selects "Use system certificates" and leaves the
"Domain" field empty, display a warning and prevent the
EAP network configuration from being saved. Such a configuration
would be insecure--the user should constrain the domain that
the system certificates can be used to validate.
BUG: 26879191
TEST: 1) Set up AP connected to test RADIUS server.
TEST: 2) Generate a self-signed cert (Cert 1)
TEST: 3) Use Cert 1 to sign another cert (Cert 2) with common name
"sub1.sub2.domain.com"
TEST: 4) Setup RADIUS server, and configure it to present Cert 2 to EAP peer.
TEST: 5) Build angler image with Cert 1 installed in
/system/etc/security/cacerts/
TEST: 6) Set up an AP connected to the RADIUS server to broadcast
a WPA-Enterprise network.
TEST: 7) On Angler, connect to this WPA-Enterprise network with settings:
Network name: (AP SSID)
Security: 802.1x EAP
EAP method: TLS
CA certificate: Use system certificates
Domain: domain.com
User certificate: (test certificate from RADIUS setup)
Identity: (identity used for RADIUS setup)
TEST: 8) Verify that we connect successfully to the AP.
TEST: 9) Verify that connection still succeeds if Domain is set to
"sub2.domain.com" and "sub1.sub2.domain.com".
TEST: 10) Verify that connection fails if Domain is set to
"sub0.sub1.domain.com" and "otherdomain.com".
TEST: 11) Verify that network configuration cannot be saved, and an
warning message "Must specify a domain" is displayed if Domain
is left blank in the configuration in step 7
TEST: 12) Verify that the "Do not validate" option still appears in the
CA certificate dropdown menu.
Change-Id: I346d4d301305719033b84ec4599bf3d57d9d4ee5
2016-02-08 08:54:42 -08:00
Julia Reynolds
9bfad94ea3
Update DND visual interruption choices.
...
Change-Id: I9313052d60a9fbd88546c1478ac9b830ae6fc40c
2016-02-08 15:19:45 +00:00
Clara Bayarri
7f2a013619
Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments
...
Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.
Bug: 26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419
2016-02-08 14:16:24 +00:00
Clara Bayarri
719668508a
Do not unify locks when Work lock is set to None
...
Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
2016-02-08 13:49:45 +00:00
Adam Lesinski
fdb17a7ba2
Merge "Update FakeUid interface to match BatteryStats.Uid"
2016-02-06 00:52:39 +00:00
Alan Viverette
145b2faf58
Merge "Reject all touch events in TouchBlockingFrameLayout"
2016-02-05 21:28:58 +00:00
