Commit Graph

10342 Commits

Author SHA1 Message Date
Julia Reynolds
8c0a423865 Split Sound & notification settings.
Bug: 25860852
Change-Id: If88daf6fd50b5abf86fb86f3590361f0118172a1
2015-11-30 11:21:41 -05:00
Jason Monk
9d80eeabe7 Add some more summaries for Settings Home
Change-Id: Iaca8db6bdce87e667832b5b670e4eb027580b668
2015-11-30 10:57:33 -05:00
Jason Monk
8b886c4649 Fix various crashes
Bug: 25894771
Bug: 25905442
Bug: 25747730
Change-Id: I9680d08514589288eadbe2a50a9ef5e03220a0c1
2015-11-30 10:54:56 -05:00
Andrei Stingaceanu
1258c4f434 Merge "Wire in device owner information into SecuritySettings" 2015-11-26 11:01:03 +00:00
Philip P. Moltmann
99f0bd4aa6 Change onResume -> onStart in the print settings to update even paused activities.
Change-Id: Ie28de2cd3ba02c3f19d11c61b3dbbce5d33ddb5a
2015-11-25 16:13:01 -08:00
Julia Reynolds
4cc3819857 Fix filter indicies.
Bug: 25837105
Change-Id: Ic857f4efdb3d25e38be7b8113cc2256127954e48
2015-11-25 08:58:44 -05:00
Sunny Goyal
2672cb0fa2 Merge "Adding the activity icon in wallpaper list" 2015-11-25 03:43:23 +00:00
Makoto Onuki
4cfe39f539 Use explicit APIs to get device owner information
Bug 24676413

Change-Id: Id346c2f01658173c9671edcfd34bc33f1b25faa4
2015-11-24 14:55:26 -08:00
Sunny Goyal
bfcf2a9044 Adding the activity icon in wallpaper list
Change-Id: Id31e6dfdfd2f214e6686d21f2aeeb68762de5893
2015-11-24 14:11:30 -08:00
Paul Lawrence
278410435a Store cooldown state through rotation
Bug:24361606
Change-Id: Ifc732ce7d157aaa9a21aaedb9e64bca9ae4a56c4
2015-11-24 12:42:09 -08:00
Svetoslav Ganov
03e1bee786 Merge "Modify system settings: incorrect UI state" 2015-11-24 19:32:51 +00:00
Svetoslav
356fb2d10d Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
2015-11-24 11:31:17 -08:00
Julia Reynolds
6f526fcaf3 Migrate package level notification settings to topic level.
Bug: 22854014
Change-Id: If0c20bec3b3f8b01b86d195d2e7ff7aa1e15882e
2015-11-20 15:09:29 -05:00
Julia Reynolds
a88265ef8a Merge "Fix crash." 2015-11-20 14:31:44 +00:00
Julia Reynolds
8431477588 Fix crash.
Bug: 25809075
Change-Id: I708a21d65943ba23aa40b4b0f3eb6cb3108e1cf4
2015-11-20 09:28:02 -05:00
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.

Fixes bug 25694018

Change-Id: I29c78e6669db79ff996a1ecdf1cf45cff9ecef69
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

* commit 'ebc5086d15bc1be602dfcd31925000e8c6184f16':
  Block developer settings during SUW
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

* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
  Block developer settings during SUW
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

* commit '5950ff1d69ca27c09569f40862201ede261c831e':
  Block developer settings during SUW
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

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
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

* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
  Block developer settings during SUW
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

* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
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

* commit '6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d':
  Preserve FRP lock if wiped during SUW
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

* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:29:12 +00:00
Russell Brenner
2075d98be6 Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am: f0ff1631de

* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
  Preserve FRP lock if wiped during SUW
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