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

26891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
70dffcbd77 Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev 
am: 80c5d6d

* commit '80c5d6db754a941537711d78c8591c872adc735c':
  Include login/alwayson in legacy VPN editor dialog

Change-Id: I599a7b0609f0f141a54cc975c97801192bf17f24
 2016-04-13 15:36:11 +00:00
Robin Lee
80c5d6db75 Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev 2016-04-13 15:26:45 +00:00
Jason Monk
c87aacb169 Work on settings startup speed 
- Cut down on amount stored in conditions xml
 - Remove extra work from dashboard startup
 - Move summary to min priority

Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes: 28134360
 2016-04-13 10:18:24 -04:00
Robin Lee
20ddd1c57b Include login/alwayson in legacy VPN editor dialog 
A little more consistent with the new app VPNs' dialogs. To make this
work it was also necessary to restart the lockdown VPN every time it is
edited, which makes sense because the expected action after editing a
VPN is that it reconnects with the new settings.

Bug: 28072644
Change-Id: I4b6a6f0a6ed96d2ec6f62889fdae4abb60d0646c
 2016-04-13 14:57:54 +01:00
Michal Karpinski
1e3b142ce9 Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev am: d4f4e2d 
am: e7b4ba9

* commit 'e7b4ba9f53b879d322361d4e3bf480b25ea66612':
  Adjusting getTitleFromOrganizationName() after API changes

Change-Id: I9804f1f58a331ff8cbbd4edc5a35daae22feb7c0
 2016-04-13 13:35:39 +00:00
Michal Karpinski
e7b4ba9f53 Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev 
am: d4f4e2d

* commit 'd4f4e2d5b5ea00e63c3da230ec80d65091dcfeaa':
  Adjusting getTitleFromOrganizationName() after API changes

Change-Id: I75c070a7549e68679492e8d44676bd814bedc117
 2016-04-13 13:32:19 +00:00
Michal Karpinski
d4f4e2d5b5 Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev 2016-04-13 13:28:06 +00:00
Shweta Chahar
90c4dabd19 Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev am: 1ec5f09 
am: c37ce20

* commit 'c37ce205d2f9a57c546bc4885038cd65d0b8b157':
  Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine.

Change-Id: I309ed32dd240b7efed39f2c311fb0db2e1b279ab
 2016-04-13 11:23:15 +00:00
shwetachahar
c37ce205d2 Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev 
am: 1ec5f09

* commit '1ec5f0965a169ca9b0f005a6107d97dbd6f5841c':
  Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine.

Change-Id: I8632218c26140d16bcc23dc46bab47ef2bd28f43
 2016-04-13 11:20:01 +00:00
Shweta Chahar
1ec5f0965a Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev 2016-04-13 11:09:14 +00:00
Victor Chang
3ade92eaed Merge ""CA cert installed" notification should take PO into account" into nyc-dev am: 60c7635 
am: 676250e

* commit '676250e35b9345b90a9690d36c077d319c3d9da9':
  "CA cert installed" notification should take PO into account

Change-Id: I982449c67976c755d38b1253688f1b7e5d8ea47e
 2016-04-13 10:28:34 +00:00
Victor Chang
676250e35b Merge ""CA cert installed" notification should take PO into account" into nyc-dev 
am: 60c7635

* commit '60c76357a0477062e96a4061425523f71b00ec00':
  "CA cert installed" notification should take PO into account

Change-Id: I1fb21e592c57990935505ec470ecd34ada17cb33
 2016-04-13 10:25:03 +00:00
Victor Chang
de15b7d3c3 Merge changes from topic \'TrustCert\' into nyc-dev am: c7ad054 
am: d4ff940

* commit 'd4ff940bc27ed4af544dd7084c5e285b18200a3a':
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs

Change-Id: I439dfc4f6797a2fe3ffa02d7742879d60698ed57
 2016-04-13 10:21:51 +00:00
Victor Chang
d4ff940bc2 Merge changes from topic \'TrustCert\' into nyc-dev 
am: c7ad054

* commit 'c7ad054bfa390c3dcc91b7abb13580c4a40e6999':
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs

Change-Id: Idcb598bf78837c3589aa1a0f11a67d9e60f174ec
 2016-04-13 10:18:39 +00:00
Victor Chang
60c76357a0 Merge ""CA cert installed" notification should take PO into account" into nyc-dev 2016-04-13 10:15:28 +00:00
Victor Chang
17ead044e1 "CA cert installed" notification should take PO into account 
- PO shows same dialog as DO, as shown in UI mock
- Keep consumer message the same
- Add cancel button
- string change
- remove TYPE_SYSTEM_ALERT due to the bug that the dialog is shown in primary user and bypass work challenge
  (Step: unlock work user -> launch dialog -> lock work user -> unlock personal user -> the dialog is still shown)
- Remove dismissKeyguard, because I believe the dialog should still be protected by the keyguard

Bug: 25772443
Bug: 18224038
Change-Id: I4f2580d1f6d2f88cfeadebcf6e8b0406e5c4b413
 2016-04-13 11:13:58 +01:00
Victor Chang
c7ad054bfa Merge changes from topic 'TrustCert' into nyc-dev 
* changes:
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs
 2016-04-13 10:12:13 +00:00
Ricky Wai
03a592c5ea Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev am: 4a314fc 
am: a71beeb

* commit 'a71beeb7fd76bcc0e0a7a018c3387619ee541a27':
  Show "work mode off" dialog when work security option is clicked

Change-Id: I2178097b9b0ef3d8868ff3aafc488b220656245e
 2016-04-13 10:11:57 +00:00
Ricky Wai
c828849403 Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev am: 4f19945 
am: 0710a4c

* commit '0710a4c96dcfa9684535fd67e2b5b81d3fc3e88d':
  Unified work lock checkbox should roll back when user cancels confirm dialog

Change-Id: Ifb3574fc80edb75662baa275b537761c574f6605
 2016-04-13 10:11:57 +00:00
Ricky Wai
a71beeb7fd Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev 
am: 4a314fc

* commit '4a314fc3caa3db8220f2192dd9f3f54144aaa0b0':
  Show "work mode off" dialog when work security option is clicked

Change-Id: I1418b2112f91cc6f02a00e7091520aab3006b067
 2016-04-13 10:08:37 +00:00
Ricky Wai
0710a4c96d Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev 
am: 4f19945

* commit '4f1994598ba27907614d381d2792508367a05131':
  Unified work lock checkbox should roll back when user cancels confirm dialog

Change-Id: Ie83daa2b232ddd6a7f733ddb8b9f0f733d62bccb
 2016-04-13 10:08:37 +00:00
Ricky Wai
4a314fc3ca Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev 2016-04-13 10:04:52 +00:00
Ricky Wai
4f1994598b Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev 2016-04-13 10:04:23 +00:00
Ricky Wai
616342bb94 Show "work mode off" dialog when work security option is clicked 
Bug: 28158297
Change-Id: I31bc3197d2ff9c95419ea87d009fe7d677181d69
 2016-04-13 10:03:31 +00:00
Seigo Nonaka
259775314a Revert "Revert "Fix no keyboard on N builds"" 
Looks like the underling issue is not fixed yet.

This reverts commit 7bb0465687.

Bug: 26190615
Bug: 28151196
Change-Id: Icee6d90fc4336e832f082ce2974edfa558170030
 2016-04-13 08:41:43 +00:00
Nicolas Prévot
b1a41697dd Merge "Show the right icon and label for work profile in data usage." into nyc-dev am: a3d18c0 
am: 51ecf5c

* commit '51ecf5c8b202f35cacbc6d5bb9f04b7b30dca34e':
  Show the right icon and label for work profile in data usage.

Change-Id: Ieae26b3f83854d63d322200f0a2038db1976a7ce
 2016-04-13 08:34:54 +00:00
Nicolas Prevot
51ecf5c8b2 Merge "Show the right icon and label for work profile in data usage." into nyc-dev 
am: a3d18c0

* commit 'a3d18c03e88cf9dda086a843a2dbf1bf4dc0b146':
  Show the right icon and label for work profile in data usage.

Change-Id: I2c82cf2ce6878f0127afba07ee9a73078b07b030
 2016-04-13 08:31:40 +00:00
Nicolas Prévot
a3d18c03e8 Merge "Show the right icon and label for work profile in data usage." into nyc-dev 2016-04-13 08:22:10 +00:00
Nathan Harold
709846a099 Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev am: 0887ace 
am: 69f68de

* commit '69f68debd59c24857662ffb34178d03742cb6dac':
  Minor Fixes for RadioInfo Test Menu

Change-Id: I4307f76190e470c4d57f247de018445d9183a6e8
 2016-04-13 07:46:34 +00:00
Nathan Harold
69f68debd5 Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev 
am: 0887ace

* commit '0887ace34472469003299d782b90c8fd9324bb7e':
  Minor Fixes for RadioInfo Test Menu

Change-Id: Ia7d06a94f81e5f27500bf63a16d95dad6f8d8829
 2016-04-13 07:43:23 +00:00
Nathan Harold
0887ace344 Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev 2016-04-13 07:37:38 +00:00
Nathan Harold
ed38afafd8 Minor Fixes for RadioInfo Test Menu 
-Fix a race condition in re-creating activity
-Ensure cell info is disabled when Menu is paused
-Fix issue with focus on creating view

Change-Id: Icfb7667fe6e47ab6dc950918447bbe892e0681ad
 2016-04-13 00:29:38 -07:00
TreeHugger Robot
297b45f35a Merge "Clearing cache for managed profile apps" into nyc-dev am: 490e40e 
am: b8b8fc2

* commit 'b8b8fc2fe5fd33e5f7b6a139c79bfd51e8ec0cd5':
  Clearing cache for managed profile apps

Change-Id: I4e6abe0faa6f91deccb8ceca3a38460bf2e61687
 2016-04-13 03:25:20 +00:00
Suprabh Shukla
b8b8fc2fe5 Merge "Clearing cache for managed profile apps" into nyc-dev 
am: 490e40e

* commit '490e40ecc842c2d333657951fd45bea358c816a5':
  Clearing cache for managed profile apps

Change-Id: Id74948c6b55f9b27f8bdcf0ee3cf0fdee323ca0d
 2016-04-13 03:22:27 +00:00
TreeHugger Robot
490e40ecc8 Merge "Clearing cache for managed profile apps" into nyc-dev 2016-04-13 03:13:48 +00:00
Chris Wren
285ad580df Merge "update station to show ranking and autobundles" into nyc-dev am: 106d8e5 
am: 7b4a9dc

* commit '7b4a9dc9ccf44aa738c1cb1834c593c91db383e6':
  update station to show ranking and autobundles

Change-Id: I049fa6fe4746532547d0c7f65a9c603c50e6dbb5
 2016-04-13 00:33:25 +00:00
Jason Monk
698ef83e0c Merge "Guard against empty extraInfo" into nyc-dev am: b63a4f8 
am: de27b15

* commit 'de27b15329e11a9787bead8560d08b530bdce089':
  Guard against empty extraInfo

Change-Id: I4ddf00b0d159e8c085049f9566f19433e4a2fc8c
 2016-04-13 00:33:25 +00:00
Jason Monk
664033d46f Merge "Work on settings startup speed" into nyc-dev am: 1fd25b9 
am: 3d4b96a  -s ours

* commit '3d4b96a46ffd44e0bc769eda90bf37043866cca2':
  Work on settings startup speed

Change-Id: Iaf559a57f57c2ec0bfd3e9a2d8caeb8882fcb936
 2016-04-13 00:33:24 +00:00
Suprabh Shukla
3f4ac54c77 Clearing cache for managed profile apps 
Added code to loop over all the child profiles and delete application
cache files for them, when clearing cache from Settings->Storage

Bug: b/25338468
Change-Id: I87dba56218402be44b71a009e93b2e93f48a574c
 2016-04-12 16:47:08 -07:00
Jason Monk
2531963171 Merge "Disable animations for bluetooth." into nyc-dev am: 90886f6 
am: b1a1722

* commit 'b1a172222834d1935f6418420c1f7e820e030463':
  Disable animations for bluetooth.

Change-Id: I2d99956f648d120798c073484db10e4684c6201a
 2016-04-12 23:40:50 +00:00
Chris Wren
7b4a9dc9cc Merge "update station to show ranking and autobundles" into nyc-dev 
am: 106d8e5

* commit '106d8e57cee93afbd25587b75455ec78f1853271':
  update station to show ranking and autobundles

Change-Id: I7eb816701684c9d48e450d3f01046eece3c3d5b2
 2016-04-12 22:44:49 +00:00
Jason Monk
de27b15329 Merge "Guard against empty extraInfo" into nyc-dev 
am: b63a4f8

* commit 'b63a4f87416bcf3170411fc336529ca8f5d14626':
  Guard against empty extraInfo

Change-Id: Iea0c1172f484554a16d8c718b24f02e9e315ac0e
 2016-04-12 22:44:49 +00:00
Jason Monk
3d4b96a46f Merge "Work on settings startup speed" into nyc-dev 
am: 1fd25b9

* commit '1fd25b982a5d80a13b4e34e2c3130dd2d7f856a6':
  Work on settings startup speed

Change-Id: Ib1ba9c56085a3a18e691bdda63a62528e0a829e3
 2016-04-12 22:44:49 +00:00
Jason Monk
b1a1722228 Merge "Disable animations for bluetooth." into nyc-dev 
am: 90886f6

* commit '90886f66f6c27ed3c67c32983aa0214e521e2d24':
  Disable animations for bluetooth.

Change-Id: I7325068e38900c7f1a16a1a8685a941ecc12707b
 2016-04-12 22:44:48 +00:00
Chris Wren
106d8e57ce Merge "update station to show ranking and autobundles" into nyc-dev 2016-04-12 21:02:15 +00:00
Jason Monk
b63a4f8741 Merge "Guard against empty extraInfo" into nyc-dev 2016-04-12 20:11:17 +00:00
Jason Monk
1fd25b982a Merge "Work on settings startup speed" into nyc-dev 2016-04-12 20:11:00 +00:00
Jason Monk
9a6349a4d5 Guard against empty extraInfo 
Change-Id: Iff297637edd3ebf5b6d26bc1dc51e9c17393e24f
Fixes: 27999693
 2016-04-12 16:03:39 -04:00
Victor Chang
caa8877f75 Show trust option for multiple unapproved cert in chain 
- Add a argument to pass user id
- Check approval status of certs in WorkerThread

Bug: 18224038
Change-Id: I5fd6a41e9593d0f339fecb4185331175e32c50c2
 2016-04-12 21:00:14 +01:00
Nicolas Prevot
cda955072d Show the right icon and label for work profile in data usage. 
Previously, it showed the icon and label of a random application.

BUG:26798809
Change-Id: I9d812943bdf6f99e87dfd9bb4a37b25644b8d18d
 2016-04-12 20:29:22 +01:00