Udam Saini
3e64c83eef
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
...
am: 4b796fa7d8
* commit '4b796fa7d843bcb4886a153962ab3fdb3716f61e':
Fixes showing learn more screen from fingerprint intro page
2016-02-10 21:43:07 +00:00
mariagpuyol
262e6f8519
Modify emergency info subtitle
...
am: 1c9b3d5b5f
* commit '1c9b3d5b5f2122fbceee1942f61e0fc6694e2ba1':
Modify emergency info subtitle
2016-02-10 21:42:58 +00:00
Udam Saini
4b796fa7d8
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
2016-02-10 21:36:55 +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
b44480912f
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev am: 335a958b57
...
am: bfdee58b89
* commit 'bfdee58b8967c0adb2509d497a9c1c32b874e265':
Change style of Preview screens (dark borders with "preview" on the bottom).
2016-02-10 18:14:19 +00:00
Udam Saini
b246c6141d
Merge "Reworks lock screen flows." into nyc-dev am: 779fdcca29
...
am: ab242afe1e
* commit 'ab242afe1eabac113c1e4fcd89fc98a637d89d0f':
Reworks lock screen flows.
2016-02-10 18:13:58 +00:00
Anna Galusza
bfdee58b89
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
...
am: 335a958b57
* commit '335a958b57045c90baad25f186a0a27f16dfa9bc':
Change style of Preview screens (dark borders with "preview" on the bottom).
2016-02-10 18:07:06 +00:00
Udam Saini
ab242afe1e
Merge "Reworks lock screen flows." into nyc-dev
...
am: 779fdcca29
* commit '779fdcca29d1c87fd5dba7fd7198db182c39620c':
Reworks lock screen flows.
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
Udam Saini
779fdcca29
Merge "Reworks lock screen flows." into nyc-dev
2016-02-10 17:54:58 +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
f53a6c90f3
Import translations. DO NOT MERGE
...
Change-Id: I4879140c3fa74a518309d9f48d3b8ca29411d9f8
Auto-generated-cl: translation import
2016-02-10 06:33:10 -08:00
Andre Eisenbach
8c32a90e9c
Add Developer menu entry to disable Bluetooth absolute volume am: 591c6c4f5a
...
am: 42aeccb95e
* commit '42aeccb95e0e716626df06bfde661a02a626cc33':
Add Developer menu entry to disable Bluetooth absolute volume
2016-02-10 09:09:47 +00:00
Andre Eisenbach
42aeccb95e
Add Developer menu entry to disable Bluetooth absolute volume
...
am: 591c6c4f5a
* commit '591c6c4f5ac73387dc83e119627344a78fd615c6':
Add Developer menu entry to disable Bluetooth absolute volume
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
Samuel Tan
c9e2bcf8e2
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920 am: aedb058e1b
...
am: 711b01b80d
* commit '711b01b80dabf096b814b7bbcb1686c462bb3adb':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 22:53:00 +00:00
Anna Galusza
5df008fd0b
Merge "Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev."
2016-02-09 20:34:30 +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
Samuel Tan
711b01b80d
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920
...
am: aedb058e1b
* commit 'aedb058e1b46ce559fc6a282820a89dcbc9c15d1':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 18:29:47 +00:00
Samuel Tan
aedb058e1b
Allow trusted system certificates to be used in EAP network configs
...
am: 2b16cd3920
* commit '2b16cd3920f95b2cd5c2426d81b5e1584ffc682d':
Allow trusted system certificates to be used in EAP network configs
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
Anna Galusza
d6717ddccf
Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev.
...
This reverts commit 206a845710 .
Change-Id: I7a773fee68c28f3046a8099fa266183c3c3799ae
2016-02-08 23:28:40 +00:00
Suprabh Shukla
c8bd4a8e61
Merge "Adding an easy uninstall for active device admin"
2016-02-08 22:41:40 +00:00
Anna Galusza
85657bc86c
Update strings for A11y SUW.
...
am: 0239f95538
* commit '0239f95538b572c7951cac65707d906ef051bbf3':
Update strings for A11y SUW.
2016-02-08 22:34:24 +00:00
Anna Galusza
2fe55a705b
Merge "Update strings for A11y SUW."
2016-02-08 21:44:32 +00:00
Anna Galusza
0239f95538
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 21:44:13 +00:00
Anna Galusza
d5c26eef64
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 11:46:21 -08:00
Julia Reynolds
1879dd1a5a
Update DND visual interruption choices.
...
am: 9bfad94ea3
* commit '9bfad94ea370f8b8048c13d16117bc8c01a394c2':
Update DND visual interruption choices.
2016-02-08 19:18:56 +00:00
Anna Galusza
62f75238e5
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)."
2016-02-08 17:46:43 +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
Anna Galusza
206a845710
Change style of Preview screens (dark borders with "preview" on the bottom).
...
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
2016-02-05 18:02:54 -08:00
Jeremy Klein
6895446453
Merge "Make TetherSettings use the new tether api."
2016-02-05 18:14:50 +00:00
Andrei Stingaceanu
da49313845
Restrict notification preferences for suspended apps
...
Bug: 26856390
Bug: 22776761
Change-Id: I7f03b8b95af93db66f12c5ac1cbf490b4ae0e73c
2016-02-05 15:24:03 +00:00
Jeremy Klein
e3e7b95312
Make TetherSettings use the new tether api.
...
The new API handles all the provisioning logic so this area can
get significant code cleanup.
Change-Id: I4bcffb14b3ce26a01d17ec149599d63b0b4392f1
2016-02-04 18:58:14 -08:00
Jason Monk
e1943293c3
Merge "Move most settings icons to vector"
2016-02-04 23:00:20 +00:00
Jason Monk
6fc1004401
Move most settings icons to vector
...
Change-Id: I04f3f0ed75f2a17942e8571393e3cceb0d2bd7ed
2016-02-04 17:57:46 -05:00
Suprabh Shukla
54fd163cf6
Adding an easy uninstall for active device admin
...
Currently the uninstall button is disabled for a package
with an active device admin. This change enables the button,
which when clicked gives the user an option to deactivate
all the DAs in the package and then uninstall the package.
Bug: b/22359208
Change-Id: I8b955305927751185a4c982dadb5b1b6b07efe5e
2016-02-04 14:53:27 -08:00
Jason Monk
a1242bcc93
Merge "Add animation for condition card height change."
2016-02-04 20:54:02 +00:00
Jason Monk
6fdf1669e1
Add animation for condition card height change.
...
Change-Id: If648914426cf6db5b039114cf593915c3b2e6c8c
2016-02-04 15:44:50 -05:00
Jason Monk
58c6dd6eee
Merge "Settings Visuals"
2016-02-04 19:47:43 +00:00
Jason Monk
322cfe8be0
Settings Visuals
...
Update the layouts to be more final, and support tablets better.
Move about to always be last.
Always see everything.
Change-Id: I4b804c9bfcd4d3b7f978a2617d5c2c2b1cdfa6e4
2016-02-04 14:37:35 -05:00
Alan Viverette
da8c8df1cd
Merge "App grid preview for screen zoom"
2016-02-04 16:07:42 +00:00
Alan Viverette
1912725628
App grid preview for screen zoom
...
Change-Id: I718468dc03800d125eea1c57c8e5dfbc84aa3367
2016-02-04 10:12:05 -05:00
Anna Galusza
4a05b2906f
Merge "UI fixes (back arrow, blue switch bar, append whether Talkback is on to summary), Talkback no longer disabled when preference is tapped, fixes SettingsPreferenceFragment to not check parent class to determine whether to show options menu."
2016-02-03 21:40:08 +00:00
Jason Monk
0ec94e0064
Merge "String refinements touch -> tap"
2016-02-03 19:11:52 +00:00