Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,402 Commits 1 Branch 0 Tags
0886bf22716d6e0501b6a5cb7bc202a01e2df875
Commit Graph

22244 Commits

Author SHA1 Message Date
Sudheer Shanka
f23a161d65 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 
am: 7469d799a8

* commit '7469d799a8acaa1fd72aa0545d090d57d5e9d29a':
  Avoid triggering device admin settings in non-current user.

Change-Id: I3106a0c680bc5f267cefe9621b37ccc3186561ec
 2016-06-03 17:24:06 +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
Sudheer Shanka
7469d799a8 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: Ica84a34db826fa02130aa85efff40544b246c3ef
 2016-06-03 17:13:09 +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
Sanket Agarwal
3d06893ba6 Handle return value when Bluetooth is enabled 
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.

Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
 2016-06-03 01:07:24 +00:00
Fyodor Kupolov
d4f31e2b8d Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca am: 06a9c98bb8 
am: a67010c6f1

* commit 'a67010c6f17bf5cd3d897e8930467a37f56f6838':
  Make prefs without an action unselectable

Change-Id: I399dbb551f1c8d81e1e7af368e7119bd1d83f08e
 2016-06-02 23:00:22 +00:00
Fyodor Kupolov
a67010c6f1 Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca 
am: 06a9c98bb8

* commit '06a9c98bb8af4eb3a7fbd65239deabc79853c54d':
  Make prefs without an action unselectable

Change-Id: I7781c25e91056ddb8d94b1ad5f4fc709d0fbfbb0
 2016-06-02 22:49:41 +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
06a9c98bb8 Merge "Make prefs without an action unselectable" into nyc-dev 
am: 9121169dca

* commit '9121169dca4bf3f11908031fd72448025d3933d4':
  Make prefs without an action unselectable

Change-Id: I214ef870006bf5257ac3b51354ce20c429db3ea5
 2016-06-02 22:44:44 +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
0319f37b69 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c am: 704476a96d 
am: 1aa166f490

* commit '1aa166f490910b2fb0f90c3c7703c1b779938b24':
  Revert "Add an entry in developer options for location tools."

Change-Id: I93d4f261feb7efdeae5559eba729066c4f4061e2
 2016-06-02 17:28:42 +00:00
Wei Wang
1aa166f490 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c 
am: 704476a96d

* commit '704476a96d5363679ddcb6d311bb6ca7c4a5faae':
  Revert "Add an entry in developer options for location tools."

Change-Id: I3ed38b246d4f9aa64daa1c432d8f0b5020515e5a
 2016-06-02 17:25:41 +00: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
704476a96d 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: I894e3bf6602adfb539b795e00f23d369dcb66251
 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
2cf7ecc1d4 Merge "onResume -> onStart, onPause -> onStop" into nyc-dev 
am: 67e87fa4e9

* commit '67e87fa4e903306d4e430acd871dbad0c189b06b':
  onResume -> onStart, onPause -> onStop

Change-Id: I1ca7fdc7246d40c82b3828b5d46762987a0d9a14
 2016-06-01 20:32:26 +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
e59a7d1004 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 am: 4080861e75 
am: 1da829632c

* commit '1da829632c67409a3cf43bd34ba9cd3765bd58a6':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I70af91afd7cbb376ef30387d5dc3486d8544afa2
 2016-06-01 19:54:06 +00:00
Sudheer Shanka
1da829632c Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 
am: 4080861e75

* commit '4080861e75bb001413cab1f8a4ce46cb5a3f259e':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I95148191a78092ef2c69db331eba06c8d7409be8
 2016-06-01 18:57:16 +00:00
Sudheer Shanka
61617948f6 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: I662b0b1b6f316564a3f9a318e558d02f3c8a96d0
 2016-06-01 18:39:52 +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
e1563eec48 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev am: 9791704411 am: 4436467a25 
am: 69f0f29e38

* commit '69f0f29e380e2915a7a59c9e1664ecc7db242ca9':
  Cache account prefs so we don't lose a11y focus

Change-Id: I106eb14e89de5928ec3e746979ba0f4763c1c938
 2016-06-01 18:06:14 +00:00
Jason Monk
7a27663307 Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea am: dc8738fda2 
am: d2a07dfdfa

* commit 'd2a07dfdfa740fcc22a64ab3269251caec12270c':
  Fix apps spinner jank.

Change-Id: I7b940911c52a6b15d2773021e93a30107ef5eaea
 2016-06-01 18:06:13 +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
69f0f29e38 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev am: 9791704411 
am: 4436467a25

* commit '4436467a25416b382216385a231c75409c4a19b8':
  Cache account prefs so we don't lose a11y focus

Change-Id: I1fa94e39b3034dafc0e88f1d9f96262ce08cc7c2
 2016-06-01 17:42:35 +00:00
Jason Monk
d2a07dfdfa Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea 
am: dc8738fda2

* commit 'dc8738fda2a077bef2a08fd0b2444a4489b5388a':
  Fix apps spinner jank.

Change-Id: I48b1645138c047f995fb379a837594964bd27e2d
 2016-06-01 17:42:34 +00:00
Jason Monk
4436467a25 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: I9076c38574c780a20cb98f74baa092824ec1c16f
 2016-06-01 17:37:12 +00:00
Jason Monk
dc8738fda2 Merge "Fix apps spinner jank." into nyc-dev 
am: ad302548ea

* commit 'ad302548ea5a030c2e44eb22a212285493037729':
  Fix apps spinner jank.

Change-Id: I910f10090e2407c683435f7d3c4d20036c2465b5
 2016-06-01 17:37:11 +00: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
3682dd09e6 Disable restricted VPN actions onResume am: 52541536d0 am: 849edeb23e 
am: 93e8676ecc

* commit '93e8676ecc8c449aad03c9cb2e08c7aec50d4550':
  Disable restricted VPN actions onResume

Change-Id: I947153cc892c6d072b287fd5221529913095af79
 2016-06-01 14:30:49 +00:00
Robin Lee
93e8676ecc Disable restricted VPN actions onResume am: 52541536d0 
am: 849edeb23e

* commit '849edeb23e2bc7e798159a497039aa81320ec47c':
  Disable restricted VPN actions onResume

Change-Id: I2875be42188dc978a431a78d3b4d6260d5a075b1
 2016-06-01 14:26:19 +00:00
Robin Lee
8a8f3f2f34 Disable restricted VPN actions onResume 
am: 52541536d0

* commit '52541536d0d4c8f78be26f94fa8f0cf297bde1c4':
  Disable restricted VPN actions onResume

Change-Id: I24606b4201605bea8377c5385b5b8d1720a44cb1
 2016-06-01 14:22:07 +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
13adfba9ad Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 5ab70294ed 
am: 24b39dce00

* commit '24b39dce002479369c782887b036f936cb27c776':
  Show different strings when PO/DO user approves a cert

Change-Id: Iced70f167bcf899a4dab8c16e048a90d41b0d310
 2016-06-01 10:22:44 +00:00
Victor Chang
24b39dce00 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 
am: 5ab70294ed

* commit '5ab70294ed03f83fd0789477a005225d8caebd5c':
  Show different strings when PO/DO user approves a cert

Change-Id: Ib0e1fc2a8f086e7ebf06b3f745f18c343a9ac682
 2016-06-01 10:18:07 +00: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
7a37b70bda 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: I5dd1261e9def95d952538736401bb4c16f6fb61a
 2016-06-01 10:13:51 +00:00