Robin Lee
e8fce6d433
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
Restrict Settings always-on to NYC+
Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
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
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
* commit 'a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
Avoid triggering device admin settings in non-current user.
Change-Id: I0557ea43f891a272f946987197bbb7df0aef9b0e
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
* commit '9121169dca4bf3f11908031fd72448025d3933d4':
Make prefs without an action unselectable
Change-Id: Ia3b0efe9acd7c4ebf9213d141211f23322b8152e
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
* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
Revert "Add an entry in developer options for location tools."
Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
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
.
Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
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
* commit 'df66d4abf0c994b5f53ec0978ba97e746852e3e9':
Start DeviceAdminSettings in a new task from support dialog.
Change-Id: I6a249b3e238f0ab8336e1a6d81bf77d7b2d3a11d
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
* commit '979170441191f4c0fa292def1f2124bd62f70ffb':
Cache account prefs so we don't lose a11y focus
Change-Id: I475b564279160e4100008fb6affb48d1659de05f
2016-06-01 17:30:19 +00:00
Jason Monk
f4c27c2689
Merge "Fix apps spinner jank." into nyc-dev
...
am: ad302548ea
* commit 'ad302548ea5a030c2e44eb22a212285493037729':
Fix apps spinner jank.
Change-Id: I1867f2166dea86a9debd6f4304d6e43a8cbe32aa
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
* commit '52541536d0d4c8f78be26f94fa8f0cf297bde1c4':
Disable restricted VPN actions onResume
Change-Id: I24772b0a6bc5b34bb5dc98508d26ab98d43bc670
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
* commit '36522e885479b30bc49a8a7333f436d5744431bc':
Show different strings when PO/DO user approves a cert
Change-Id: I1cf166e58afd13c0927eb4460a7d88a22ba9dfe7
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
* commit 'a260cf8931bb51e2a8879deb8461c9444595b786':
Show only up to two locales in Settings
Change-Id: I8da73979371f5342fc1cd636e0483b7507a06697
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
* commit '8eaa3de9317eb21855db43ed276b90ca48ad1d28':
Fix pref availability for search
Change-Id: I777450a2531d9c817d6ff76068b6ac7c02fcb782
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
* commit 'da52f08b0a86182cef1f0949f0ef45d5efa092cc':
Don't allow restricted data usage of system
Change-Id: Ic6bba24f75979f9c9ac1fdcf8127f89770bf1f57
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
Jason Monk
9b926c0bc6
Don't allow restricted data usage of system
...
Cause it will just crash
Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes: 28979013
2016-05-27 10:57:10 -04:00
Julia Reynolds
9782079130
Importance slider updates.
...
Icon & tint.
Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-27 10:00:46 -04:00
Bart Sears
72167fe650
Revert "Importance slider updates."
...
This reverts commit 373a9e2fcf
.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
2016-05-27 04:47:02 +00:00
Julia Reynolds
b0f0d299cf
Merge "Importance slider updates." into nyc-dev
...
am: 7c2c025e4f
* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
Importance slider updates.
Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6
2016-05-27 04:04:31 +00:00
Roozbeh Pournader
217b1d1581
Show only up to two locales in Settings
...
The list could otherwise grow very long, spamming the screen.
Bug: 28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
2016-05-26 19:01:06 -07:00
Andrew Sapperstein
517f14f3d8
Remove the last vestiges of #ff009587.
...
It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.
BUG: 28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6
2016-05-26 17:18:38 -07:00