Andrei Stingaceanu
999014702c
Wire in device owner information into SecuritySettings
...
If the device owner information has been provisioned by device
policy client via the DevicePolicyManager then make the current
user info preference read only and add a summary to specify that
the preference has been disabled by the administrator.
Bug: 22547309
Change-Id: I14952abd2e022607b82ce4361cfa514549243045
2015-11-20 11:55:41 +00:00
Jim Miller
f5a2a7edb9
Merge "Revert "Auto advance fingerprint enrollment when user taps on the sensor""
2015-11-19 22:05:08 +00:00
Jim Miller
c5e286570b
Revert "Auto advance fingerprint enrollment when user taps on the sensor"
...
This reverts commit b3253f1d75
2015-11-19 22:03:28 +00:00
Jeff Sharkey
a180abf6cf
Merge "Mark this coreApp as being encryptionAware."
2015-11-19 18:45:41 +00:00
Jeff Sharkey
3bd73edbae
Mark this coreApp as being encryptionAware.
...
Historically, apps marked with "coreApp" were prepared to run in a
limited boot environment, and were critical to booting the device, so
in the new file-based encryption world we're marking these apps with
both "forceDeviceEncrypted" and "encryptionAware" attributes.
Bug: 22358539
Change-Id: Idf9fb8d4b0cc1cd504c9ab7ed770d2cd86d3d506
2015-11-19 11:11:03 -07:00
Julia Reynolds
a19090a7df
Merge "Remove 'peekable' notification preference."
2015-11-19 13:41:01 +00:00
Julia Reynolds
69d0b67ee0
Remove 'peekable' notification preference.
...
Bug: 22854014
Change-Id: I920185cd8c766436338d38a51663bd5480699f5d
2015-11-18 17:05:18 -05:00
Ben Kwa
1c212aa92c
Merge "Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE"
2015-11-18 21:15:36 +00:00
Russell Brenner
23e7dd8796
resolve merge conflicts of 549379737d to master.
...
Change-Id: I8a6e83948a1915483567734fa99d903acf7e4754
2015-11-18 10:16:55 -08:00
Jason Monk
1f8bd6f479
Fix settings crashes on larger devices
...
Just remove this code until its updated for the new settings home.
Bug: 25750060
Change-Id: I8132598c4b76ef290d180af3d472686b41cb594c
2015-11-18 12:58:07 -05:00
Ben Kwa
0c851297b4
Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE
...
BUG=23137963
Change-Id: I32e995b4421de4c90faa4e80a095c7df2f7aee25
2015-11-18 09:41:38 -08:00
Russell Brenner
ff8a68010e
resolve merge conflicts of 7285e2c2fc to master.
...
Change-Id: I56ebcc0dac917791b19ee308eed30bb51267a817
2015-11-18 09:13:31 -08:00
Tony Mantler
e5f836b010
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
2015-11-18 16:47:38 +00:00
Jason Monk
fb8e1f7a7b
Merge "Fix DataUsageSummary formatting"
2015-11-18 15:43:45 +00:00
Jason Monk
27e0f92774
Merge "Summary support for Settings Home"
2015-11-18 15:08:01 +00:00
Tony Mantler
b280b0a892
Move AnimatedImageView and AuthenticatorHelper to SettingsLib
...
Change-Id: I51d5711b0e626b5e7f83af985d02090480085ac7
2015-11-17 15:13:29 -08:00
Julia Reynolds
5555d26b20
Apply DND to visual effects.
...
Bug: 25423508
Change-Id: I00ace3da8a7fea089f4d0fc3f6161452285abb8e
2015-11-17 17:21:31 -05:00
Russell Brenner
549379737d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d
...
am: ebc5086d15
2015-11-17 20:40:50 +00:00
Russell Brenner
f0d538f08d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69
...
am: 2b29501039
2015-11-17 20:23:22 +00:00
Russell Brenner
2b29501039
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e
...
am: 5950ff1d69
2015-11-17 20:14:22 +00:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
...
am: 8e4f6fbc2e
2015-11-17 20:05:54 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
2015-11-17 19:56:48 +00:00
Jason Monk
e634ff376e
Fix DataUsageSummary formatting
...
Change-Id: I8b983aad88ddcde88b433def6bc181b8febc2a65
2015-11-17 13:52:47 -05:00
Jason Monk
3069581512
Summary support for Settings Home
...
Also add summaries to a few of the major items.
Change-Id: I17924f14941fe095d819e142cdd21cf4b4e9ffd1
2015-11-17 13:51:45 -05:00
Jason Monk
8d249e839c
Merge "First pass at restyling dashboard"
2015-11-17 14:00:30 +00:00
Russell Brenner
7285e2c2fc
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb
...
am: 6a7ff3186b
2015-11-17 01:47:46 +00:00
Russell Brenner
7d44fe6fdb
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
...
am: 2075d98be6
2015-11-17 01:29:12 +00:00
Russell Brenner
2075d98be6
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
...
am: f0ff1631de
2015-11-17 01:22:41 +00:00
Russell Brenner
f0ff1631de
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed
Merge "Block developer settings during SUW" into lmp-mr1-dev
2015-11-17 01:13:55 +00:00
Tony Mantler
bc07b1ed33
Merge "Move some methods to DeviceInfoUtils in SettingsLib"
2015-11-16 18:12:50 +00:00
Russell Brenner
14bf226c79
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a
Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:08:51 +00:00
Paul Lawrence
44df047c73
Merge "Make Convert To File Encryption work"
2015-11-13 17:25:09 +00:00
Robin Lee
8edd4c1f8d
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b am: 905829393d
...
am: 3ed65b90d0
2015-11-13 14:14:09 +00:00
Robin Lee
3ed65b90d0
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b
...
am: 905829393d
2015-11-13 14:11:32 +00:00
Robin Lee
905829393d
Merge "VPN settings: grey out policy-restricted menus"
...
am: ee4808d37b
2015-11-13 14:08:52 +00:00
Robin Lee
ee4808d37b
Merge "VPN settings: grey out policy-restricted menus"
2015-11-13 14:07:05 +00:00
Robin Lee
4198607ee2
VPN settings: grey out policy-restricted menus
...
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
2015-11-13 14:01:43 +00:00
Philip P. Moltmann
3bc72ec0e0
Merge "Finish adjusting the code of PrintServiceSettingsFrament to the changes made in the layout."
2015-11-13 00:21:09 +00:00
Sanket Padawe
1b4ab5f05f
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee am: df5b8c5b65
...
am: f20ba4b797
2015-11-13 00:11:59 +00:00
Philip P. Moltmann
86846685a0
Finish adjusting the code of PrintServiceSettingsFrament to the changes made
...
in the layout.
Bug: 25645752
Change-Id: I54401075d4c604850287c7dd101cf4f4b4f21459
2015-11-12 16:11:27 -08:00
Sanket Padawe
f20ba4b797
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee
...
am: df5b8c5b65
2015-11-13 00:07:06 +00:00
Sanket Padawe
e595ab1a01
Make phone number in Sim Settings read properly in Talk back mode.
...
Bug: 24308980
Change-Id: I384ec4ed8863cf6bdfa6e84ed2d88d9eda4ff42e
2015-11-12 15:59:54 -08:00
Sanket Padawe
0ad16831ee
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: dbc47fb262
2015-11-12 23:57:48 +00:00
Sanket Padawe
98f11fd1a4
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262
2015-11-12 23:54:06 +00:00
Sanket Padawe
dbc47fb262
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
2015-11-12 14:55:51 -08:00
Jason Monk
52a302e81b
Support changes in support prefs for DeviceDefault themes
...
Change-Id: Id9c333aed202cca8a8845e6f58af1c252e7e111a
2015-11-12 10:09:10 -05:00
Paul Lawrence
0e1a46cf6c
Make Convert To File Encryption work
...
Actually call to recovery from ConvertToFBE
Adding credential check
Gray out Convert option when converted
Change-Id: Ic98929ff49733d182b529012e58870156f40679a
2015-11-11 15:03:42 -08:00
