PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,261 Commits 1 Branch 0 Tags
b0d54ca66083e945d0b51a3801e36873dd24c466
Commit Graph

30261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
0f008bf7e6 Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca 
am: a015e6ca16

* commit 'a015e6ca1687b7a3eb9778ba1c05c78fe7b90e84':

Change-Id: If901d9be4a932342f58e3a480cda8fa1c02e45b6
 2016-06-02 23:00:16 +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
c02cea5898 Merge "Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c am: c687e9bfbd" into nyc-mr1-dev-plus-aosp 
am: 7da19a1610

* commit '7da19a1610af28ac5effa618b2f7773ae9b460a5':

Change-Id: Ic62ec94cc533893a532c48f27ef510dfce39a663
 2016-06-02 17:28:52 +00: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
Android Build Merger (Role)
7da19a1610 Merge "Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c am: c687e9bfbd" into nyc-mr1-dev-plus-aosp 2016-06-02 17:26:41 +00:00
Wei Wang
ba05928629 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c 
am: c687e9bfbd

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

Change-Id: I2dfa59969134f1253c5465aebf4d12db4cad69b5
 2016-06-02 17:26:12 +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
71798b065b resolve merge conflicts of 67e87fa to nyc-mr1-dev am: 718c84f121 -s ours 
am: b2af26dc9d

* commit 'b2af26dc9d2cef6d836877ec144ed04ea2b0b74a':

Change-Id: I0d0a33684ca649ba2e5a94ed26f47b9b68271cb4
 2016-06-01 21:35:50 +00:00
Jason Monk
b2af26dc9d resolve merge conflicts of 67e87fa to nyc-mr1-dev 
am: 718c84f121  -s ours

* commit '718c84f121c5c5237d346596f1d755e3d45f8d6a':

Change-Id: I487d39f0c62a9f028262cd36b255583411649e7b
 2016-06-01 21:17:27 +00:00
Jason Monk
a1ee8a78e0 Merge "onResume -> onStart, onPause -> onStop" into nyc-dev am: 67e87fa4e9 am: 2cf7ecc1d4 -s ours 
am: a7f93dce8e

* commit 'a7f93dce8e0ea478db4c19a4e632792ab3a5dc4a':
  onResume -> onStart, onPause -> onStop

Change-Id: I6d32dcc8ed6f41a5d1653d8b50dffb1dee2ce499
 2016-06-01 21:15:40 +00:00
Jason Monk
a7f93dce8e Merge "onResume -> onStart, onPause -> onStop" into nyc-dev am: 67e87fa4e9 
am: 2cf7ecc1d4  -s ours

* commit '2cf7ecc1d436b4a37733af584867922700d3fcc2':
  onResume -> onStart, onPause -> onStop

Change-Id: I9ed1382d6ecc6e3206af357e66fff986fa1914f6
 2016-06-01 20:41:54 +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
f849d2d5fb Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 am: 61617948f6 
am: d8f2e34919

* commit 'd8f2e34919624464e8577cf1b8ec2e9601119886':

Change-Id: I834a94f46af1e11b30b05135f4a75281d53fbeb5
 2016-06-01 19:54:07 +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
d8f2e34919 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 
am: 61617948f6

* commit '61617948f6c658c5a6d31f409ca66f58f4cf3cb4':

Change-Id: I13ebba33cc7a112b9533de2f11185f656064d549
 2016-06-01 19:09:18 +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
a7c69d87f9 Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506 am: 7e1b47347a 
am: 1412c15769

* commit '1412c15769d8a1587ee7168c44449aa15caf284e':

Change-Id: I1916ff7e1b4affc4b29062331914a917cefdc45c
 2016-06-01 18:07:14 +00:00
Jason Monk
a61f0c1421 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev am: 9791704411 am: 6548f7f3f5 
am: df2af190d2

* commit 'df2af190d28f3f40efb8972258393060a592943e':

Change-Id: I3aa55cd02b975a5a894598f88b13a53e3109bdd3
 2016-06-01 18:06:18 +00:00
Jason Monk
0a8cd3ae0a Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea am: f4c27c2689 
am: 7a5a8c5bf0

* commit '7a5a8c5bf03dafcc440e45e4d4aaf68955aa4559':

Change-Id: I7e08d09edb184ac6add140a8e19c8c235e984f42
 2016-06-01 18:06:16 +00:00
Jason Monk
ffa396e741 Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506 am: 4f63855b5a 
am: 7dc8293963

* commit '7dc82939637499660e0ab713f19b11977d271587':
  Fix some top-level settings not updating with language

Change-Id: Ib65a09bf6d46eedd7cb6dd28fe70ecadb6ce1e46
 2016-06-01 18:06:15 +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
1412c15769 Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506 
am: 7e1b47347a

* commit '7e1b47347a9f44d1b6748ea28ac8fe3912a4d27a':

Change-Id: If779d25d133428ba1f9b50f3908f77c4ad5154eb
 2016-06-01 17:48:00 +00:00
Jason Monk
df2af190d2 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev am: 9791704411 
am: 6548f7f3f5

* commit '6548f7f3f5e973ac50f0626d9cf1cd2a1e5c3537':

Change-Id: Ie28198dd7c6b15f0cd5d7523a577ae2a8305d2b5
 2016-06-01 17:47:59 +00:00
Jason Monk
7a5a8c5bf0 Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea 
am: f4c27c2689

* commit 'f4c27c2689bace3065fda604db29327266e815ab':

Change-Id: Ia6ac9ea57faed125464abff7d3f0d5902a6f7646
 2016-06-01 17:47:59 +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
7dc8293963 Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506 
am: 4f63855b5a

* commit '4f63855b5a8274622b6390467fdaf73d491bb2e7':
  Fix some top-level settings not updating with language

Change-Id: I37449c716a0944f91818ee68fae663fce8d4dabe
 2016-06-01 17:42:36 +00: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
7e1b47347a Merge "Fix some top-level settings not updating with language" into nyc-dev 
am: ed70356506

* commit 'ed703565063107350970959d82ac63eb76b51d26':
  Fix some top-level settings not updating with language

Change-Id: I4f2f0295a73e115fdcc8eb76cc40854cc98e493c
 2016-06-01 17:39:13 +00:00
Jason Monk
4f63855b5a Merge "Fix some top-level settings not updating with language" into nyc-dev 
am: ed70356506

* commit 'ed703565063107350970959d82ac63eb76b51d26':
  Fix some top-level settings not updating with language

Change-Id: I8f1e9c469f5e732d9f04a9b0060a30c5ffb55218
 2016-06-01 17:37:13 +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