Alan Viverette
447bb2f7da
Merge "Move DensityUtils into SettingsLib" into nyc-dev
...
am: 30dbd47
* commit '30dbd47a29fb12f1a5c5027d6719397fb322fe9e':
Move DensityUtils into SettingsLib
2016-03-25 20:06:34 +00:00
Alan Viverette
30dbd47a29
Merge "Move DensityUtils into SettingsLib" into nyc-dev
2016-03-25 19:59:38 +00:00
Alan Viverette
6b0b73fdc4
Move DensityUtils into SettingsLib
...
Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
2016-03-25 14:56:25 -04:00
Udam Saini
fc76f5ffd4
Merge "Updates spacing on redaction interstitial" into nyc-dev am: 375b981
...
am: f7e45a7
* commit 'f7e45a7f281a399ed373d6aac892d63941be33de':
Updates spacing on redaction interstitial
2016-03-24 22:45:00 +00:00
Udam Saini
f7e45a7f28
Merge "Updates spacing on redaction interstitial" into nyc-dev
...
am: 375b981
* commit '375b981267aea4f3fb3374d2a6e18339125dd455':
Updates spacing on redaction interstitial
2016-03-24 22:40:16 +00:00
Udam Saini
375b981267
Merge "Updates spacing on redaction interstitial" into nyc-dev
2016-03-24 22:20:10 +00:00
Udam Saini
dd05ab7600
Changes SetupRedactionInterstitial to be an optional step
...
We no longer need this to be in inside the setup flow when setting up
the lock screen. Move this class to be used as an optional step if a
lock screen is added.
bug:23893721
Change-Id: I15478e0f0d8d8771cbdce6ccf0f508cbd5dd4f36
2016-03-24 15:08:19 -07:00
Hall Liu
b8eb4a1c55
Merge "Add indicator for system dialer in Settings" into nyc-dev am: f3dc18b
...
am: 736afac
* commit '736afac6cbfdc2f96fc074afbc6f25f5243fba42':
Add indicator for system dialer in Settings
2016-03-24 17:43:04 +00:00
Hall Liu
736afac6cb
Merge "Add indicator for system dialer in Settings" into nyc-dev
...
am: f3dc18b
* commit 'f3dc18b65bd78d7f00b6255208864cb6899674bc':
Add indicator for system dialer in Settings
2016-03-24 17:39:30 +00:00
Hall Liu
f3dc18b65b
Merge "Add indicator for system dialer in Settings" into nyc-dev
2016-03-24 17:29:39 +00:00
Yorke Lee
fe803a7be4
Merge "Fix build" into nyc-dev am: d0f8d92
...
am: abe553e
* commit 'abe553ed0d4bd4f268b70b4850525fb9895fb7f3':
Fix build
2016-03-23 18:55:10 +00:00
Yorke Lee
abe553ed0d
Merge "Fix build" into nyc-dev
...
am: d0f8d92
* commit 'd0f8d9257b0b1076bbc5fa567fe98c2ae460a291':
Fix build
2016-03-23 18:47:58 +00:00
Udam Saini
ec0baa9701
Updates spacing on redaction interstitial
...
Cleans up the look and feel on the redaction interstitial page
bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
2016-03-23 11:29:15 -07:00
Yorke Lee
d0f8d9257b
Merge "Fix build" into nyc-dev
2016-03-23 18:17:58 +00:00
Yorke Lee
d448522a6f
Fix build
...
Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68
2016-03-23 11:11:46 -07:00
Sudheer Shanka
7d1fe37af9
Merge "Add more policy transparency for wifi settings." into nyc-dev am: ed0d4dd
...
am: add53df
* commit 'add53dfcb1eec18615610a632493fb591f924170':
Add more policy transparency for wifi settings.
2016-03-23 18:10:59 +00:00
Sudheer Shanka
97c891b8ee
Merge "Add disabled by policy empty views to more screens." into nyc-dev am: 561a88c
...
am: 9ddc14e
* commit '9ddc14e7c72f4deb89c904efd2f57608c4da78ab':
Add disabled by policy empty views to more screens.
2016-03-23 18:10:58 +00:00
Sudheer Shanka
add53dfcb1
Merge "Add more policy transparency for wifi settings." into nyc-dev
...
am: ed0d4dd
* commit 'ed0d4dd463494c011ffcbd079ec321aa1d95e2b4':
Add more policy transparency for wifi settings.
2016-03-23 18:06:22 +00:00
Sudheer Shanka
9ddc14e7c7
Merge "Add disabled by policy empty views to more screens." into nyc-dev
...
am: 561a88c
* commit '561a88cfcd21bcfd2a02c9fa3f3575566ccf7a72':
Add disabled by policy empty views to more screens.
2016-03-23 18:06:21 +00:00
Sudheer Shanka
ed0d4dd463
Merge "Add more policy transparency for wifi settings." into nyc-dev
2016-03-23 17:53:19 +00:00
Sudheer Shanka
561a88cfcd
Merge "Add disabled by policy empty views to more screens." into nyc-dev
2016-03-23 17:53:15 +00:00
Abodunrinwa Toki
0a35d8a5af
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev am: 14df560
...
am: 181b63e
* commit '181b63ebe09e2ef24bc1d2ad96d79e383525ed02':
InputSettings: Physical keyboard settings activity.
2016-03-23 16:16:53 +00:00
Abodunrinwa Toki
181b63ebe0
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
...
am: 14df560
* commit '14df56074435ef5cab4010d5c782fdd682509244':
InputSettings: Physical keyboard settings activity.
2016-03-23 16:12:49 +00:00
Abodunrinwa Toki
14df560744
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
2016-03-23 16:03:24 +00:00
Geoff Mendal
9203c33008
Import translations. DO NOT MERGE
...
Change-Id: Ibcc935d8f8e5e2af9746f8ba9032855017110127
Auto-generated-cl: translation import
2016-03-23 07:39:30 -07:00
Geoff Mendal
a5421e8f38
Import translations. DO NOT MERGE
...
Change-Id: I39432205d099c448867c42392f9a6e574105fd43
Auto-generated-cl: translation import
2016-03-23 06:35:05 -07:00
Abodunrinwa Toki
b28b2cc68f
InputSettings: Physical keyboard settings activity.
...
This CL adds functionality to trigger the "Physical keyboard"
settings screen via an intent.
Bug: 26943892
Change-Id: Ib4a0be38f94f83672501d5312079d132b2ab717d
2016-03-22 17:17:41 +00:00
Tony Mantler
1890a9bca8
Merge "Move hint strings to SettingsLib" into nyc-dev am: 829d517
...
am: 1721681
* commit '172168131a0045ecc61825cebffb3520fd1ff4eb':
Move hint strings to SettingsLib
2016-03-22 16:27:56 +00:00
Tony Mantler
172168131a
Merge "Move hint strings to SettingsLib" into nyc-dev
...
am: 829d517
* commit '829d5173d881fb02289aab3e3024e2c0c98650ab':
Move hint strings to SettingsLib
2016-03-22 16:24:49 +00:00
Tony Mantler
50124b5fee
Move hint strings to SettingsLib
...
b/18246360
Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
2016-03-21 14:51:55 -07:00
Victor Chang
f2ad4b1ffd
Merge "Per vpn setting change in VPN list" into nyc-dev am: 32da1ec
...
am: d0fc82f
* commit 'd0fc82fd66477a14e2f3edf646fd51321c7fa935':
Per vpn setting change in VPN list
2016-03-21 15:28:15 +00:00
Victor Chang
d0fc82fd66
Merge "Per vpn setting change in VPN list" into nyc-dev
...
am: 32da1ec
* commit '32da1ecdca5e447268da5166f4a020ff9b54ab44':
Per vpn setting change in VPN list
2016-03-21 15:25:39 +00:00
Victor Chang
32da1ecdca
Merge "Per vpn setting change in VPN list" into nyc-dev
2016-03-21 15:20:14 +00:00
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
Geoff Mendal
288e1d1682
Merge "Import translations. DO NOT MERGE"
2016-03-21 13:47:06 +00: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
Geoff Mendal
da970e6c7d
Import translations. DO NOT MERGE
...
Change-Id: I85c85f558c3aa45ea3242df019597b1cedaf17d7
Auto-generated-cl: translation import
2016-03-21 06:31:50 -07:00
Victor Chang
3ea5630690
Merge "Vpn settings per vpn" into nyc-dev am: df21cc7
...
am: dcb3f2f
* commit 'dcb3f2f3fd0ad10effee66ec8f55416fff61318a':
Vpn settings per vpn
2016-03-21 13:18:51 +00:00
Victor Chang
dcb3f2f3fd
Merge "Vpn settings per vpn" into nyc-dev
...
am: df21cc7
* commit 'df21cc7de9a6c5543095b0b9eca476b1ff853982':
Vpn settings per vpn
2016-03-21 13:16:29 +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
Mahaver Chopra
8b64b1a65a
Merge "User should confirm device lock before un-unifying" into nyc-dev am: ad1b7f6
...
am: a4474c7
* commit 'a4474c7286e3b8386589031d2bd6bd6b336db641':
User should confirm device lock before un-unifying
2016-03-21 11:20:17 +00:00
Mahaver Chopra
a4474c7286
Merge "User should confirm device lock before un-unifying" into nyc-dev
...
am: ad1b7f6
* commit 'ad1b7f611310513b7dac74ffaff929c745126f44':
User should confirm device lock before un-unifying
2016-03-21 11:17:58 +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
bddb7deb7a
Import translations. DO NOT MERGE
...
Change-Id: Ia02626660408f6f177ca4d052cbc03eb26c0a871
Auto-generated-cl: translation import
2016-03-18 20:52:22 -07: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
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