PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,950 Commits 1 Branch 0 Tags
083ba3cc2ac3494ab8e03cd2303f454e3a57d6ab
Commit Graph

26950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Agarwal
083ba3cc2a Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92 
am: e1fa67c165

* commit 'e1fa67c165ab7f1475ca4fc89be4e98dafa68a1d':
  Handle return value when Bluetooth is enabled

Change-Id: I2446e2ab09eb061be09fafc73ed71e10dadd47ab
 2016-06-03 18:01:45 +00:00
Sanket Agarwal
e1fa67c165 Merge "Handle return value when Bluetooth is enabled" 
am: cc889f6b92

* commit 'cc889f6b9293cf9d9b693d721369f71aefeb1b6a':
  Handle return value when Bluetooth is enabled

Change-Id: I5bda2e1e740846a3da07cec95987b7ec800221fd
 2016-06-03 17:51:28 +00:00
Treehugger Robot
cc889f6b92 Merge "Handle return value when Bluetooth is enabled" 2016-06-03 17:42:38 +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
Makoto Onuki
a8a8167ebb Fix RTL layout 
am: 3a87050921

* commit '3a87050921f78e0882893bc343e49b8bb1b34975':
  Fix RTL layout

Change-Id: Ic758b78742843261a92f9f87bc2f602223955e8e
 2016-06-03 15:33:57 +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
Makoto Onuki
3a87050921 Fix RTL layout 
Bug 29072224

Change-Id: I414d868b4256e034850a873511bf34d9430842dc
 2016-06-02 17:52:17 -07: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
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
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
67e87fa4e9 Merge "onResume -> onStart, onPause -> onStop" into nyc-dev 2016-06-01 20:09:00 +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
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
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
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
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
fb9e8e3188 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:14:12 +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
Bill Yi
824b1f09f7 Import translations. DO NOT MERGE 
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
 2016-06-01 06:23:22 -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
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
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
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
Tony Mak
fe0ce01da7 Fix RTL issue in Trusted Credentail page 
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
   to resolve the random issue. I guess it is a framework bug, but
   anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout

Bug: 28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
 2016-05-31 19:53:49 +00:00
Jason Monk
a4bc49e55e Fix some top-level settings not updating with language 
They need to be resources so they can load correctly on locale
change.

Change-Id: Iea167b8df411528185987d37704717d9c0b9f254
Fixes: 28861758
 2016-05-31 14:49:03 -04:00
Bill Yi
d18592cdbb Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: aa56eef3fd  -s ours

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

Change-Id: Ib86e499fbcaa25922071cdb5fc08eccdeb5ca5f6
 2016-05-31 16:34:43 +00:00
TreeHugger Robot
aa56eef3fd Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 16:22:40 +00:00
Roozbeh Pournader
aacca81c31 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: I34fae4ef523d9719ce09cc62cd556c56b232b003
 2016-05-31 01:14:42 +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
Bill Yi
9a18500160 Import translations. DO NOT MERGE 
Change-Id: If3ccb0d85f8c6ab4d8c4968445989fd0083fcbe9
Auto-generated-cl: translation import
 2016-05-30 12:06:25 -07:00
Jason Monk
6ed9be1352 Merge "Fix pref availability for search" into nyc-dev 
am: 8eaa3de931

* commit '8eaa3de9317eb21855db43ed276b90ca48ad1d28':
  Fix pref availability for search

Change-Id: If1baba85d5d2897f5a360a75aad96ac72bfe1bd7
 2016-05-27 17:08:54 +00:00
Jason Monk
3b8dd1eeae 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: Id5ad8e2b5ab03f397e0340f83b97e3598a308403
 2016-05-27 17:08:54 +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