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

26224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
a6269236a2 Merge "Don't crash trying to disable lockdown VPN" into nyc-dev 2016-05-25 21:05:54 +00:00
TreeHugger Robot
c416433a9e Merge "Skip indexing content while user is locked." into nyc-dev 2016-05-25 18:27:29 +00:00
Jason Monk
6cb280d146 Don't update conditions on background threads 
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.

Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277
 2016-05-25 12:53:34 -04:00
Jeff Sharkey
c4eac99223 Skip indexing content while user is locked. 
Otherwise we try touching printing services which throw.

Bug: 28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
 2016-05-25 10:52:34 -06:00
Ricky Wai
9579274cda Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
 2016-05-25 13:11:24 +00:00
TreeHugger Robot
06b7d7cdf9 Merge "Remove option to configure emergency app" into nyc-dev 2016-05-25 00:17:20 +00:00
Victor Chang
32e17d0862 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 2016-05-24 14:03:29 +00:00
Victor Chang
45ca906e27 Trust the certificate after unlocking screenlock 
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately

Bug: 28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
 2016-05-23 20:11:18 +01:00
TreeHugger Robot
dad7b893b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:35:35 +00:00
TreeHugger Robot
b103f4497d Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev 2016-05-23 13:45:55 +00:00
Bill Yi
906224c4dd Import translations. DO NOT MERGE 
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
 2016-05-23 06:35:00 -07:00
Victor Chang
b0054ec4e2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 2016-05-23 11:51:54 +00:00
Baligh Uddin
ffe930ec76 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
 2016-05-21 13:10:17 -07:00
Adrian Roos
78091bf8ca Remove option to configure emergency app 
Bug: 28873644
Change-Id: Iddf4e781af8cb3ca3b62d1141c58402933bd8ec8
 2016-05-20 14:36:24 -07:00
Felipe Leme
f8265a8f1e Merge "Defined help page for Data Saver." into nyc-dev 2016-05-20 21:27:57 +00:00
Felipe Leme
746b384700 Fixed whitelist stats so it's only logged on add. 
BUG: 28166693
Change-Id: If1f91167c21054e78a966670c20c174c3f73d2a5
 2016-05-20 14:13:22 -07:00
Jason Monk
d3ce331b94 Merge "Protect against monkey crash" into nyc-dev 2016-05-20 18:21:08 +00:00
Jason Monk
fd41b42487 Protect against monkey crash 
When rebuild comes in after context is no longer valid

Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes: 28875397
 2016-05-20 14:15:10 -04:00
Victor Chang
5e0a46bff6 Fix Continous loop in unifed screenlock when trying to Trust a CA cert 
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT

Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.

In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.

Set StrongAuth to "not required" when it has been successfully unlocked.

Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
   (Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
   -> no fingerprint option, PIN unlock successful to turn work mode on

Bug: 28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
 2016-05-20 19:10:33 +01:00
Victor Chang
99a88eca78 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 2016-05-20 17:19:42 +00:00
Victor Chang
00859bd548 Temp fix for NPE when race condition happens in TrustedCredentialsSettings 
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
 2016-05-20 17:19:29 +00:00
Felipe Leme
cf2c0b1b97 Defined help page for Data Saver. 
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
 2016-05-20 09:08:28 -07:00
Jason Monk
290ca6ec5c Don't use ApplicationsState for summaries 
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.

Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes: 28435146
 2016-05-20 09:37:53 -04:00
Sanket Agarwal
77ad3c2531 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-05-19 18:27:03 +00:00
Kenny Guy
726085c5c7 Merge "Update work challenge background image." into nyc-dev 2016-05-19 11:01:37 +00:00
Baligh Uddin
7ffeda3633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 19:06:53 +00:00
Kenny Guy
846e182385 Update work challenge background image. 
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.

Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
 2016-05-18 16:14:19 +01:00
Julia Reynolds
fc1bb74186 Merge "Null check." into nyc-dev 2016-05-18 14:02:05 +00:00
Yohei Yukawa
1ef9c4afd5 Follow class package change: LocaleList 
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1].  This CL follows up that
package change.

No behavior change is intended.

 [1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18

Bug: 28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
 2016-05-17 16:25:39 -07:00
Pankaj Kanwar
4dd2fdf90b Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev 2016-05-17 22:16:49 +00:00
Julia Reynolds
47beeec10b Null check. 
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes: 28531037
 2016-05-17 16:14:10 -04:00
pkanwar
956597eaf8 Choose Bluetooth Device window cant't fill screen 
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.

Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
 2016-05-17 12:03:42 -07:00
TreeHugger Robot
c769ddd330 Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev 2016-05-17 18:28:21 +00:00
Shweta Chahar
1cb87b2af5 Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev 2016-05-17 14:27:09 +00:00
Robin Lee
dfd2fc6d06 Don't crash trying to disable lockdown VPN 
Bug: 28624328
Change-Id: I2b726453da43feaf5f46d45679a702a52e6f4df0
 2016-05-17 14:58:32 +01:00
shwetachahar
43d93289ba Modify the TTS engine preference UI so that the radio button and the TTS 
engine name are a single focusable element.

Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
 2016-05-17 13:56:57 +01:00
Baligh Uddin
e5e29d5073 Import translations. DO NOT MERGE 
Change-Id: I1f10df22a0d22c5408d2c1cc83441e19ffa28405
Auto-generated-cl: translation import
 2016-05-16 23:39:18 -07:00
Felipe Leme
b2c4949de7 Implemented onRestrictBackgroundBlacklistChanged(). 
BUG: 28743623

Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
 2016-05-16 20:43:12 +00:00
TreeHugger Robot
31fb2a7a1d Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev 2016-05-16 20:19:07 +00:00
Julia Reynolds
075690875b Merge "Fix crash on rotation." into nyc-dev 2016-05-16 20:12:06 +00:00
Julia Reynolds
176b28663b Fix crash on rotation. 
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes: 28767083
 2016-05-16 15:56:15 -04:00
Sudheer Shanka
dc3ed0a5bf Fix crash in SetupRedactionInterstitial. 
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
 2016-05-16 11:46:34 -07:00
Julia Reynolds
f1c2e62f4e Merge "Catch rule creation exceptions." into nyc-dev 2016-05-16 18:22:15 +00:00
Julia Reynolds
992422fd5e Catch rule creation exceptions. 
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
 2016-05-16 09:53:23 -04:00
Clara Bayarri
fcc411c807 Rename requestKeyboardShortcutsHelper 
Per API Council feedback

Bug: 28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
 2016-05-16 14:16:46 +01:00
TreeHugger Robot
15c1bb48c3 Merge "Guard against exception when getting package installer info." into nyc-dev 2016-05-13 21:18:06 +00:00
Sudheer Shanka
aed0537aaf Guard against exception when getting package installer info. 
Bug: 28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
 2016-05-13 12:58:42 -07:00
Makoto Onuki
a23cd4614f Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev 2016-05-13 18:51:41 +00:00
Julia Reynolds
5c401966a3 Merge "Don't crash on invalid numbers." into nyc-dev 2016-05-13 18:14:59 +00:00
Julia Reynolds
b9cad485af Don't crash on invalid numbers. 
Change-Id: I5c1bff5733c5db5f411c2827177b0c1efa1e120e
Fixes: 28756890
 2016-05-13 14:01:40 -04:00