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

30282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Monk
ed70356506 Merge "Fix some top-level settings not updating with language" into nyc-dev 2016-06-01 17:27:49 +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
Bill Yi
a1b824c9fc Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours am: b925300049 -s ours 
am: 9ce91ecb0f  -s ours

* commit '9ce91ecb0f0837307b91206d02333cac5990d2d3':

Change-Id: I2c9506023e1d52ac11b37b36c9b223147b45aa14
 2016-06-01 15:48:32 +00:00
Bill Yi
9ce91ecb0f Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours 
am: b925300049  -s ours

* commit 'b925300049818ece4f0ace2adda4c1d425ccef56':

Change-Id: I2e9fdce3c21114ba3e47d53e8cf8d50b484f384a
 2016-06-01 15:35:44 +00:00
Bill Yi
ba4dfdf8c1 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: da38e871de -s ours" into nyc-mr1-dev-plus-aosp 
am: 3856317f50  -s ours

* commit '3856317f50d44eb1667fb4d7684184848ec5fcf9':
  Import translations. DO NOT MERGE

Change-Id: Ied54ef6f58473e82656adbe049d73b94c09b0966
 2016-06-01 15:31:04 +00:00
Bill Yi
9ce895e8a7 Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours am: 11c16c1256 -s ours 
am: 9fbda9f906  -s ours

* commit '9fbda9f9063dc714c103d9a31d0615364a46f065':
  Import translations. DO NOT MERGE

Change-Id: I32b78c4f23d3a4ede2587c0b774a21d812fd8344
 2016-06-01 15:31:02 +00:00
Android Build Merger (Role)
3856317f50 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: da38e871de -s ours" into nyc-mr1-dev-plus-aosp 2016-06-01 15:26:49 +00:00
Bill Yi
6401220f84 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: da38e871de  -s ours

* commit 'da38e871dec8c2b6c7f4040bef5b9558cb09906b':
  Import translations. DO NOT MERGE

Change-Id: I27d5aa82acf2c7ea467a734853a4a66169f355c3
 2016-06-01 15:26:32 +00:00
Bill Yi
9fbda9f906 Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours 
am: 11c16c1256  -s ours

* commit '11c16c125687c8d9a148561ab829710256bf429a':
  Import translations. DO NOT MERGE

Change-Id: Ie885058c122791f9cf63057e41f1cfe95241da99
 2016-06-01 15:26:30 +00:00
Bill Yi
b925300049 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: fb9e8e3188  -s ours

* commit 'fb9e8e31884e26f09ac35ec81ab5fc8c518a0945':
  Import translations. DO NOT MERGE

Change-Id: Ife2d19d87b06863ed5743a516959a5c3d84e56b2
 2016-06-01 15:22:23 +00:00
Bill Yi
11c16c1256 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: fb9e8e3188  -s ours

* commit 'fb9e8e31884e26f09ac35ec81ab5fc8c518a0945':
  Import translations. DO NOT MERGE

Change-Id: I7f7eda9e147f87c2c4c487addc2fbfe4b1ec1831
 2016-06-01 15:22:22 +00:00
TreeHugger Robot
ef64a8f89d Merge "Import translations. DO NOT MERGE" 2016-06-01 15:18:37 +00:00
TreeHugger Robot
fb9e8e3188 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:14:12 +00:00
TreeHugger Robot
da38e871de Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:12:42 +00:00
Robin Lee
f64c766d33 Merge "Disable restricted VPN actions onResume am: 52541536d0 am: 8a8f3f2f34" into nyc-mr1-dev-plus-aosp 
am: d3dc50ceb1

* commit 'd3dc50ceb1b459178e998186d4c57a7225e72055':

Change-Id: I0c0db607b5373c450b045be3521ddd435f474272
 2016-06-01 14:30:50 +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
Android Build Merger (Role)
d3dc50ceb1 Merge "Disable restricted VPN actions onResume am: 52541536d0 am: 8a8f3f2f34" into nyc-mr1-dev-plus-aosp 2016-06-01 14:26:33 +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
5aa8a34802 Disable restricted VPN actions onResume am: 52541536d0 
am: 8a8f3f2f34

* commit '8a8f3f2f34ffeef8c964b02101456f8acf85c681':
  Disable restricted VPN actions onResume

Change-Id: Ib154d49c196ec8586f2df9641a9fdbc4f305870b
 2016-06-01 14:26:18 +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
Bill Yi
d3cf866b7c Import translations. DO NOT MERGE 
Change-Id: I6e36edcd4fa922050390eb4f0e934b910b0a33c6
Auto-generated-cl: translation import
 2016-06-01 06:40:08 -07:00
Bill Yi
824b1f09f7 Import translations. DO NOT MERGE 
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
 2016-06-01 06:23:22 -07:00
Bill Yi
177eb426c1 Import translations. DO NOT MERGE 
Change-Id: Ie52cf27f9003c53990a2ac475b59ffdb18add7aa
Auto-generated-cl: translation import
 2016-06-01 05:34:58 -07: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