Jim Miller
5b9fab40a0
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:29 +00:00
TreeHugger Robot
f8c64089b1
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Meng Wang
0dc4311333
Wi-Fi Calling settings UI update
...
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
2016-06-06 16:49:02 -07:00
Robin Lee
e8fce6d433
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
2016-06-06 21:09:30 +00:00
Robin Lee
8f2c17e12c
Merge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c
Fix data usage format strings
...
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Andrew Sapperstein
6c52398695
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
2016-06-03 22:22:38 +00:00
Sudheer Shanka
377623b6ee
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:14:43 +00:00
TreeHugger Robot
a433fd2429
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
2016-06-03 17:02:51 +00:00
Fyodor Kupolov
a015e6ca16
Merge "Make prefs without an action unselectable" into nyc-dev
...
am: 9121169dca
2016-06-02 22:49:07 +00:00
Fyodor Kupolov
9121169dca
Merge "Make prefs without an action unselectable" into nyc-dev
2016-06-02 22:30:22 +00:00
Andrew Sapperstein
1fad9af3c7
Add safety & regulatory info to "about device".
...
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".
The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.
BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
2016-06-02 14:12:19 -07:00
Sudheer Shanka
8b72e563ec
Avoid triggering device admin settings in non-current user.
...
Bug: 28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
2016-06-02 12:40:22 -07:00
Fyodor Kupolov
77865ec827
Make prefs without an action unselectable
...
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug: 29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
2016-06-02 10:39:33 -07:00
Wei Wang
c687e9bfbd
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
...
am: d0d3ca3b7c
2016-06-02 17:22:59 +00:00
Wei Wang
d0d3ca3b7c
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba
Revert "Add an entry in developer options for location tools."
...
Bug:28251942
This reverts commit e1c1a13cba
2016-06-02 04:42:02 +00:00
Jason Monk
718c84f121
resolve merge conflicts of 67e87fa to nyc-mr1-dev
...
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
2016-06-01 16:20:01 -04:00
Jason Monk
67e87fa4e9
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
2016-06-01 20:09:00 +00:00
Sudheer Shanka
4080861e75
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
...
am: df66d4abf0
2016-06-01 18:39:24 +00:00
TreeHugger Robot
df66d4abf0
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
2016-06-01 18:16:21 +00:00
Jason Monk
350a930c68
onResume -> onStart, onPause -> onStop
...
For SettingsActivity and DashboardSummary
Bug: 28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
2016-06-01 13:45:25 -04:00
Jason Monk
6548f7f3f5
Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
...
am: 9791704411
2016-06-01 17:30:19 +00:00
Jason Monk
f4c27c2689
Merge "Fix apps spinner jank." into nyc-dev
...
am: ad302548ea
2016-06-01 17:30:13 +00:00
Jason Monk
9791704411
Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev
2016-06-01 17:19:56 +00:00
Jason Monk
cd66b4a99f
Cache account prefs so we don't lose a11y focus
...
Fixes: 28767151
Change-Id: I876712c42b02bb2efaaa492ad951ad42935ecb32
2016-06-01 17:19:01 +00:00
Jason Monk
ad302548ea
Merge "Fix apps spinner jank." into nyc-dev
2016-06-01 17:03:54 +00:00
Jason Monk
8a5d4bfbb8
Fix apps spinner jank.
...
Change-Id: I7fbe580627538037fd0f1823787f7dcebbb43252
Fixes: 29056706
2016-06-01 12:57:05 -04:00
Sudheer Shanka
65cabcd4ee
Start DeviceAdminSettings in a new task from support dialog.
...
Bug: 28998790
Change-Id: Ia43d6e719124e0908ec8ccb8c1ba7e80b5297096
2016-06-01 16:29:20 +00:00
Robin Lee
849edeb23e
Disable restricted VPN actions onResume
...
am: 52541536d0
2016-06-01 14:22:07 +00:00
Robin Lee
52541536d0
Disable restricted VPN actions onResume
...
Otherwise it's pretty easy to circumvent any future restrictions by
keeping VPN settings for a particular app open and continuing to use
it even after DISALLOW_CONFIG_VPN is applied.
Two checks:
1) in onResume (catches almost every case)
2) in setAlwaysOn (catches every remaining case)
Bug: 28733079
Change-Id: I1c67bb14891ef620df5ed65fbd32678e417b4a65
2016-06-01 11:32:32 +01:00
Victor Chang
5ab70294ed
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
...
am: 36522e8854
2016-06-01 10:13:52 +00:00
Victor Chang
36522e8854
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
2016-06-01 10:07:16 +00:00
Meng Wang
90e8e4713c
Launch E911 address management activity at turning on Wifi Calling
...
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
2016-05-31 15:57:27 -07:00
Victor Chang
71d1fed0e7
Show different strings when PO/DO user approves a cert
...
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"
The change only applies to ProfileOwner and DeviceOwner case
Fix: 28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
2016-05-31 22:43:09 +01:00
Andrew Sapperstein
9ca09c020e
Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev
2016-05-31 18:38:07 +00:00
Daniel Nishi
d7efefa503
Merge "Add an automatic storage management job service." into nyc-mr1-dev
2016-05-31 18:25:18 +00:00
Daniel Nishi
80c204420b
Add an automatic storage management job service.
...
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.
This is a temporary landing place and will be refactored very
quickly out of Settings.
Bug: 28600825
Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
2016-05-31 16:50:48 +00:00
Anna Galusza
bab65d9fc4
Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev
2016-05-31 16:39:46 +00:00
Roozbeh Pournader
c34946b8fb
Merge "Show only up to two locales in Settings" into nyc-dev
...
am: a260cf8931
2016-05-31 01:20:52 +00:00
Roozbeh Pournader
a260cf8931
Merge "Show only up to two locales in Settings" into nyc-dev
2016-05-31 01:02:41 +00:00
Anna Galusza
6b1e9dbea4
Change Nav bar style to use system nav (new style for Nexus N+)
...
Bug: 27612740
Change-Id: I309cf8252285130a0e1d2c03ca664706e73cce16
2016-05-27 18:21:54 -07:00
Jason Monk
83c2670cda
Merge "Fix pref availability for search" into nyc-dev
...
am: 8eaa3de931
2016-05-27 17:09:56 +00:00
Jason Monk
ef19af788c
Merge "Don\'t allow restricted data usage of system" into nyc-dev
...
am: da52f08b0a
2016-05-27 17:09:55 +00:00
Jason Monk
8eaa3de931
Merge "Fix pref availability for search" into nyc-dev
2016-05-27 17:07:23 +00:00
Jason Monk
be9412107d
Fix pref availability for search
...
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes: 28987828
2016-05-27 12:58:53 -04:00
Jason Monk
da52f08b0a
Merge "Don't allow restricted data usage of system" into nyc-dev
2016-05-27 16:51:59 +00:00
