PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,564 Commits 1 Branch 0 Tags
98921f0397b23d8c5347138e1e2e68c5b51a34fb
Commit Graph

29564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Victor Chang
54825c2ee0 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 7a37b70bda 
am: fc9cbd17f3

* commit 'fc9cbd17f30879a5518cff7eaa56f926a6ec41f5':

Change-Id: Icf0efe91816e7682c9ae693fac9596182e1e4050
 2016-06-01 10:22:45 +00: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
fc9cbd17f3 Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 
am: 7a37b70bda

* commit '7a37b70bda1bbc4a1ca8754c6a503111c1f9b4a0':

Change-Id: I51c3364033b106763fc7745600c9483d59eecbc3
 2016-06-01 10:18:27 +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
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
Tony Mak
cf55f787a9 Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: 0b86c6bcc6" into nyc-mr1-dev-plus-aosp 
am: 7d3cd0b1d3

* commit '7d3cd0b1d363a82c16df8c1e9f9ba9a752d42af4':

Change-Id: I1f4da304802b8a468c96cb1bbc982b06d2c4839d
 2016-06-01 09:52:49 +00:00
Tony Mak
94f187e0b4 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: caeb93ceda 
am: 2abfd032d5

* commit '2abfd032d5ed250981d02dfd2746f450c0b65631':
  Fix RTL issue in Trusted Credentail page

Change-Id: I5ad04475a651a885ae2228efb6cf10be56133864
 2016-06-01 09:52:48 +00:00
Android Build Merger (Role)
7d3cd0b1d3 Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: 0b86c6bcc6" into nyc-mr1-dev-plus-aosp 2016-06-01 09:48:40 +00:00
Tony Mak
2abfd032d5 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 
am: caeb93ceda

* commit 'caeb93ceda8bb07c015025a00714241a78a42976':
  Fix RTL issue in Trusted Credentail page

Change-Id: I603af8b3455cba99ee8bde3c9dce805b59c10c51
 2016-06-01 09:48:27 +00:00
Tony Mak
ed66066174 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 
am: 0b86c6bcc6

* commit '0b86c6bcc65a8df9cb78b2fdc41f4ad0b71550ff':
  Fix RTL issue in Trusted Credentail page

Change-Id: I0e3dff9ef8b4019ba5badb6b159268013f92b172
 2016-06-01 09:48:27 +00:00
Tony Mak
caeb93ceda Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: Ib91896687a2c5297ae9f1454b0b7729e2dd670a7
 2016-06-01 09:44:06 +00:00
Tony Mak
0b86c6bcc6 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: I0d5504ccca59ee03b7ad8efbd26128f394721b82
 2016-06-01 09:44:06 +00:00
Tony Mak
ffb10f8156 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 2016-06-01 09:36:51 +00:00
宋凯伦
0fb2f2bd00 Fix the memory leak in TetherSettings 
https://code.google.com/p/android/issues/detail?id=210848

We need to close the bluetooth adapter's profile proxy in OnDestroy 
method, or it will cause TetherSettings object to be held and won't
release. And finally it will cause OOM issue.
Change-Id: Id7667f751697c8ef9fccaaabfed28a91d4fa4960
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com>
 2016-06-01 02:13:50 +00:00