Commit Graph

3647 Commits

Author SHA1 Message Date
Victor Chang
32da1ecdca Merge "Per vpn setting change in VPN list" into nyc-dev 2016-03-21 15:20:14 +00: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
Hall Liu
cbde0b8afd Add indicator for system dialer in Settings
Bug: 26748630
Change-Id: I60b9f2783fb4c1f49c79449dd150132c73a9fb2a
2016-03-18 16:49:16 -07: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
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
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
Sudheer Shanka
d0145cc87a Merge "Fix string typo." into nyc-dev 2016-03-17 21:41:43 +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
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
Sudheer Shanka
f1e78d35dc Add disabled by policy empty views to more screens.
Bug: 27588316
Bug: 27588671
Bug: 27588740
Change-Id: Id614067d76e936e9c3c585fdaed304bfbc88dc74
2016-03-16 22:33:37 -07:00
Meng Wang
2ccf1fd7c9 Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev 2016-03-16 23:24:40 +00:00
Robin Lee
d0979a540b Merge "Show "no vpns added" for empty vpn screen" into nyc-dev 2016-03-16 21:30:54 +00:00
Robin Lee
eb034eb65e Show "no vpns added" for empty vpn screen
Removed the left-alignment on restricted empty views which was
inherited from Bluetooth settings but inconsistent with normal
settings fragments.

Bug: 22685111
Change-Id: I3a36c47d523392b8925031d4cac2ab3ef681e360
2016-03-16 20:28:52 +00:00
Mahaver Chopra
c63ef946d4 Title text and input bar should be white
Bug: 27147209

Change-Id: I428ae98ef60db22d50305df39d8d16e63bd5e14f
2016-03-16 17:42:24 +00:00
Mahaver Chopra
8b06553a27 Work Profile Security Challenge: Finalised strings
Bug: 25601630

Change-Id: I388fba7dc08196faed35f2e990d558d22a6bbaa4
2016-03-16 17:28:58 +00:00
Julia Reynolds
017ae508a0 String and accessibility changes.
Bug: 27490367
Bug: 27491350
Bug: 27655047
Bug: 24573668
Change-Id: I972d15666b206fd4f94fc55bec77b8cfbc6b7e04
2016-03-16 11:40:54 -04:00
Daichi Hirono
1a1ad649c2 Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev 2016-03-16 01:59:44 +00:00
Maria Garcia Puyol
82c512dbd6 Merge "Dialog for emergency info" into nyc-dev 2016-03-15 20:52:17 +00:00
Udam Saini
0cf2502c10 Sets the divider style to either for fingerprint.
This keeps the divider style to match the rest of settings.

bug:27619572
Change-Id: Ieef37adae119311106d47321b7f3495446d5da7d
2016-03-15 13:44:05 -07:00
Anna Galusza
a1a11d1944 Change magnification strings and accessibility traversal order in preview pane.
Bug: 27499075
Bug: 27326035

Change-Id: I03ff9574d845a1c2573aa6f4f2462851c56b3c04
2016-03-15 10:22:33 -07:00
Daichi Hirono
a7dfcac8d7 Fix description of MTP option in the "Use USB for" dialog.
BUG=27150127

Change-Id: Ib5bdd6394ae2a8a64b95ddfc07ccf7bfd0c8f335
2016-03-15 11:20:36 +09:00
Meng Wang
dcd0bf72b8 Show ICCID in SIM status, if CarrierConfigManager allows.
Bug: 27574058
Change-Id: I5c08d31b5e8ea3c3ad79361e660256b070ff7284
2016-03-14 17:42:48 -07:00
Udam Saini
6ea990a7e0 Merge "Adjusts layout on encryption interstitial." into nyc-dev 2016-03-14 17:42:08 +00:00
mariagpuyol
ae49edbdfd Dialog for emergency info
Bug:27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
2016-03-11 21:06:23 -08:00
Udam Saini
01c581b9bd Adjusts layout on encryption interstitial.
This adds extra spacing needed now that there is a divider between
the description and the first selected item. Also adds icons for
the encryption interstitial.

bug:27306696
Change-Id: I0952d543ad121b0dfee5c052a67ca042d381f930
2016-03-11 15:36:36 -08:00
Mihai Niță
42734c1551 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev 2016-03-11 22:05:18 +00:00
Mihai Nita
d3062b90c1 Settings: change "Language & input" to -> "Languages & input"
Because now the user can select more than one locale.

Bug: 26849449

Change-Id: I7927fb53012444afafe327e7103ada8ae9808dac
2016-03-11 12:42:59 -08:00
Pankaj Kanwar
856e72d3d5 Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev 2016-03-11 20:38:11 +00:00
pkanwar
fae7e6cd97 Remove band preference in WiFi settings.
Bug: b/25743379

Change-Id: Iddea166e0e0925fffb70de80978501945e8999a7
2016-03-11 08:28:18 -08:00
Anna Galusza
d658c0f6af Update preview border.
Bug: 27396174

Change-Id: I23d24246eb7a571db4548965c77428532da0b59a
2016-03-10 13:14:30 -08:00
Jason Monk
0d44cc192b Merge "Rename more to other networks" into nyc-dev 2016-03-10 20:29:46 +00:00
Jason Monk
34ed8a243b Rename more to other networks
Bug: 26780911
Change-Id: I42e1a322966b7920a281153889f44052450714b5
2016-03-10 15:21:04 -05:00
Udam Saini
87427a9cdd Merge "Change a tap & hold to touch & hold." into nyc-dev 2016-03-10 18:46:41 +00:00
Abodunrinwa Toki
1abf436466 Merge "Fix work challenge background size." into nyc-dev 2016-03-10 18:42:03 +00:00
Sudheer Shanka
1749d518b7 Merge "Adjust restricted lock positions as per new design." into nyc-dev 2016-03-10 15:58:15 +00:00
Sudheer Shanka
115d15763d Adjust restricted lock positions as per new design.
Bug: 27263531
Change-Id: I7e38a9e3356ca43ed936de1e6f8190eba4d4773e
2016-03-10 07:54:36 -08:00
Udam Saini
38130b2078 Change a tap & hold to touch & hold.
There were ux concerns with tap and hold being unclear compared to touch
and hold. One instance of this was forgotten from an earlier checkin.

bug:26562712
Change-Id: I643d1435d66e62987a8c94e0110f70f6ea4078b9
2016-03-09 19:27:57 -08:00
Makoto Onuki
e263401610 Merge "Add "Reset ShortcutManager throttling" to dev options" into nyc-dev 2016-03-09 22:13:05 +00:00
Makoto Onuki
bdcce70572 Add "Reset ShortcutManager throttling" to dev options
Bug 27325877

Change-Id: Ib11d670b38055801ce19aea9530ad69907c9bd8e
2016-03-09 14:08:54 -08:00
Abodunrinwa Toki
80c082f066 Fix work challenge background size.
Bug: 26820717
Change-Id: Icd984b7bb7517ac01a3fa5ca26d060ea33b58a99
2016-03-09 16:48:43 +00:00
Sudheer Shanka
64d424a1c2 Merge "Update the timeout list dialog in display and security settings." into nyc-dev 2016-03-09 16:24:55 +00:00