Commit Graph

26656 Commits

Author SHA1 Message Date
Geoff Mendal
6aad5a1bda Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-21 14:41:10 +00:00
Geoff Mendal
92046e2274 Import translations. DO NOT MERGE
Change-Id: Ie958cde80e3f06203380e8f77f67faff9259bd6b
Auto-generated-cl: translation import
2016-03-21 07:40:16 -07:00
Oleksandr Peletskyi
7aeb56ce6b Block "Screen lock" menu for Work Challenge.
For Work Challenge feature "Screen lock" menu item for managed
profile is completely disabled in case, if
PASSWORD_QUALITY_MANAGED is set and user choose not to use
the same lock.

BUG: 25549437
Change-Id: I201aecb91ba8c2868e57e2014d125b149aeac377
2016-03-21 14:45:50 +01:00
Victor Chang
df21cc7de9 Merge "Vpn settings per vpn" into nyc-dev 2016-03-21 13:09:07 +00:00
Victor Chang
14c2ac4dcb Per vpn setting change in VPN list
- Show admin support details when user taps on a cell and user restriction is on
- Show always-on-vpn active status in preference summary
- User can still open non-configurable per-VPN info page even when user restriction is applied
- Rename ConfigPreference to LegacyVpnPreference
- Move summary String handling into ManageablePreference
- ManageablePreference inherits GearPreference to reuse the code
- Don't show disconnect dialog when always-on is enabled

BUG=26950700

Change-Id: I37b087879cf3b674df528e7787d7bb1eead3310f
2016-03-21 12:36:44 +00:00
Victor Chang
16da2aa450 Vpn settings per vpn
This CL adds a setting for each VPN
- When no_config_vpn user restriction is applied, user can't change anything in the page
- Launch the subsetting activity in the corresponding user to unlock keystore and force work challenge
- Show dialog when user replace always-on-VPN package
- When forget VPN, unset always-on-vpn

TODO: show per-VPN status in VPN list

Change-Id: Ica360ea44117db6a4ecfaed1eec6c188189c246c
2016-03-21 12:36:23 +00:00
Clara Bayarri
ad1b7f6113 Merge "User should confirm device lock before un-unifying" into nyc-dev 2016-03-21 11:12:20 +00:00
Geoff Mendal
5f96b25dae Import translations. DO NOT MERGE
Change-Id: I2683d49e5f8a7beaa6eb6ee88265cda4fae9a2ca
Auto-generated-cl: translation import
2016-03-19 04:17:38 +01:00
Hall Liu
cbde0b8afd Add indicator for system dialer in Settings
Bug: 26748630
Change-Id: I60b9f2783fb4c1f49c79449dd150132c73a9fb2a
2016-03-18 16:49:16 -07:00
Anna Galusza
e9b5d5980b Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev 2016-03-18 21:32:52 +00:00
Mahaver Chopra
26632097ba User should confirm device lock before un-unifying
User should confirm device lock before un-unifying
Move Use the same lock toggle the first option
When Unifying Title while confirming device password is of profile.

Bug: 26815727
Bug: 27523804
Bug: 27547551

Change-Id: I44857f7dcff3d68486e7e4d2ae8565b56d7c91b7
2016-03-18 19:36:47 +00:00
Jason Monk
aa864953b7 Guard against crash in dev options
Bug: 27480962
Change-Id: I22d799f8796f94febda7bd49eb7431d29201e37f
2016-03-18 15:16:18 -04:00
Jason Monk
f38fb38f26 Switch to whitelist for animations
Disable animations for all SettingsPreferenceFragments, unless they
explicitly ask for them before creating their preference screens.

Turn it on for all fragments using the cached removal currently.

Bug: 27713314
Change-Id: I1bc14e7aeb3ee5b8ddb4f3547f472305cd312edf
2016-03-18 15:16:12 -04:00
Tony Mak
2bfbcfae13 Merge "Should read specific user's password restriction" into nyc-dev 2016-03-18 18:51:58 +00:00
Tony Mak
b27d5b2007 Clear mHasResult if the result is dispatched
The bug is because we dispatch the result again in setListener.
We should reset mHasResult if the result is dispatched already.
This bug is actually not work-challenge specific, I can reproduce it
in the setting to change screen lock.

Bug: 27242673
Change-Id: I29d2769a16c53d7103dafe1811bc808d634a8d85
2016-03-18 18:44:57 +00:00
Jason Monk
b56d3a6c33 Merge "Fix bluetooth device forgetting" into nyc-dev 2016-03-18 18:13:47 +00:00
Jason Monk
38d8fc0f86 Fix bluetooth device forgetting
Bug: 27476922
Change-Id: I8c5b7076a04185371311fb4ff1c1ba0df0df19dc
2016-03-18 14:11:25 -04:00
Anna Galusza
416f72b36c Stops black screen from being displayed on changing Vision Settings in SUW.
Bug: 27328791

Change-Id: Ied247c3a31dfc50c0113667e63aea4a0c771f7bc
2016-03-18 10:18:36 -07:00
Maria Garcia Puyol
db15d8e21b Merge "Remove emergency info subtitle" into nyc-dev 2016-03-18 15:37:59 +00:00
Abodunrinwa Toki
4873230326 Merge "Work challenge background: Fix top padding" into nyc-dev 2016-03-18 15:30:01 +00:00
mariagpuyol
1f8665f58a Remove emergency info subtitle
Bug:27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76
2016-03-18 08:13:49 -07:00
Maria Garcia Puyol
c35b08b4b3 Merge "Revert "Dialog for emergency info"" into nyc-dev 2016-03-18 15:06:02 +00:00
Tony Mak
25c3c54c03 Should read specific user's password restriction
Bug: 27330307
Bug: 27543548

Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
2016-03-18 14:49:52 +00:00
Philip P. Moltmann
47a9d4f70c Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev 2016-03-18 14:26:25 +00:00
Ricky Wai
3bd4771ccb Fix location settings crash when work profile is disabled
Bug: 27402597
Change-Id: Iab5f999b67e9f81977142648f90cf31acb8b5f69
2016-03-18 14:18:45 +00:00
Ricky Wai
ff99bae744 Merge "Do not connect to KeyChainService when user is not started" into nyc-dev 2016-03-18 14:16:27 +00:00
Ricky Wai
78fb3d3e42 Do not connect to KeyChainService when user is not started
Bug: 27418671
Change-Id: Id1bca405e8b0ebea79726f623aaa0c59bce0331c
2016-03-18 14:15:11 +00:00
Tony Mak
b7f1edd279 Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
The problem is because ConfirmDeviceCredentialActivity is not created
again when the new intent is fired. Add no history flag to kill it once
it is not visible. We have the exclude from recent flag anyway, so
finishing it should be fine.

Bug: 27564634
Change-Id: I2e22f3d7a108f8fbad5f27894b1a92f19d25bcda
2016-03-18 13:56:08 +00:00
Maria Garcia Puyol
da497f26d7 Revert "Dialog for emergency info"
This reverts commit ae49edbdfd.

Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
2016-03-17 22:52:44 +00:00
Sudheer Shanka
e2b2c3ffe4 Add more policy transparency for wifi settings.
Show policy transparency dialog if user tries to modify a
wifi configuration locked by device owner.

Bug: 27375948
Change-Id: I504082282f57bc5de9f097e962d195ecd2cc9da4
2016-03-17 15:35:15 -07:00
Jeff Sharkey
297ce9aaf3 Merge "Follow framework refactoring." into nyc-dev 2016-03-17 22:00:22 +00:00
Sudheer Shanka
d0145cc87a Merge "Fix string typo." into nyc-dev 2016-03-17 21:41:43 +00:00
Mahaver Chopra
e7359eee4c Merge "fix build for ag/887244" into nyc-dev 2016-03-17 21:37:20 +00:00
Anna Galusza
a6b76bc407 Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev 2016-03-17 21:20:34 +00:00
Anna Galusza
6a2a53e94d Add divider below summary text on A11y SUW hub.
Bug: 27066012

Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
2016-03-17 14:20:02 -07:00
Xiaohui Chen
e4649dde7f fix build for ag/887244
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
2016-03-17 20:41:03 +00:00
Sudheer Shanka
9a958bae30 Fix string typo.
Bug: 27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
2016-03-17 13:18:32 -07:00
Udam Saini
4c173cb46e Merge "Sets the divider style to either for fingerprint." into nyc-dev 2016-03-17 19:59:53 +00:00
Abodunrinwa Toki
af700ec6e0 Work challenge background: Fix top padding
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
2016-03-17 18:48:05 +00:00
Julia Reynolds
7c802419fd Merge "Fix build" into nyc-dev 2016-03-17 18:07:48 +00:00
Julia Reynolds
40a82187c5 Fix build
Bug: 27709695
Change-Id: I2020a33aa0a305e025d7d004df4b23838bb42992
2016-03-17 13:58:15 -04:00
Mahaver Chopra
bef02df556 Merge "Title text and input bar should be white" into nyc-dev 2016-03-17 17:49:34 +00:00
Mahaver Chopra
78a4bcd419 Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev 2016-03-17 17:48:35 +00:00
Jeff Sharkey
a806b7a61c Follow framework refactoring.
Bug: 27531029
Change-Id: Iad76ba8ae7aab361f4f3147d9ac268bc480267e7
2016-03-17 11:34:05 -06:00
Julia Reynolds
f6fb21c44d Merge "Fix crash adding an account." into nyc-dev 2016-03-17 17:30:17 +00:00
Julia Reynolds
8cedc7cae0 Fix crash adding an account.
Bug: 27709695
Change-Id: I66b69d71ed346e8d6f0d8493e6dd415d81f41ac1
2016-03-17 12:56:30 -04:00
Jason Monk
e580f94079 Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
* changes:
  Fix battery history detail up
  Fix clickability of conditionals
  Try to recycle prefs in battery summary
  Don't use animations for security settings
  Fix Settings home lifecycle
2016-03-17 13:30:14 +00:00
Robin Lee
37b179fa8c vpn: check fragment is visible before adding prefs
As VPN settings listens to network events it may get woken up again
while it's in the background.

Bug: 23596799
Change-Id: If6e07493da447d7ded324ff86b6e7d57c5c615e3
2016-03-17 10:26:51 +00:00
Daichi Hirono
23f4261e3d Merge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev 2016-03-17 10:05:49 +00:00
Daichi Hirono
9300eb1b14 Use CheckableLinearLayout for Use USB for dialog's item.
The root of "Use USB for" dialog's item is CheckableLinearLayout, which
defers the check state to direct children. However previously we had
CheckedTextView not just under CheckableLinearLayout. The structure
looks like:

Root CheckableLinearLayout -> LinearLayout -> CheckedTextView

The CL replaces the second child LinearLayout with CheckableLinearLayout
so that we can defer the state to CheckedTextView.

BUG=27708922

Change-Id: If0491235eac0a82bcb07e31856aa6b9535930fb2
2016-03-17 15:57:36 +09:00