Victor Chang
24ac9d93ca
Merge "Remove VPN Overflow menu" into nyc-dev
...
am: 2037876
* commit '2037876888db8a33b28cf5f876b5e47deec0da72':
Remove VPN Overflow menu
Change-Id: I248091e385321e75df345e4f5aab938a5fcec166
2016-03-29 18:59:46 +00:00
Victor Chang
2037876888
Merge "Remove VPN Overflow menu" into nyc-dev
2016-03-29 18:51:33 +00:00
Jason Monk
4a0575081c
Revert "Rename more to other networks"
...
Bug: 27638488
This reverts commit 34ed8a243b .
Change-Id: I5e10e11d40d24ae26c8605f832c43bd41c62c1dc
2016-03-29 17:12:56 +00:00
Victor Chang
6005aefd44
Remove VPN Overflow menu
...
- Move always-on option for legacy vpn into the legacy vpn config page
- This implementation doesn't show dialogue when replacing existing always-on vpn
- Continue to disable lockdown option for legacy vpn when "persist.radio.imsregrequired" is true.
Not applying to vpn app
- Force to save account info when legacy vpn is always-on
- When legacy vpn is always-on, don't try to connect. (Otherwise, an exception is thrown)
TODO: Remove EXTRA_PICK_LOCKDOWN in LockdownVpnTracker in framework
Bug: 26950700
Change-Id: Ia80669359c0b7cdb955c84937156c020ac6e9af5
2016-03-29 17:28:36 +01:00
Noah Wang
863c595262
Replace "A" icon with underline with simple "A" icon on font size
...
settings screen
Bug: 27694339
Change-Id: I56c3b2bbaec36022730a8d392531f9e13d612184
2016-03-28 20:18:31 -07:00
Udam Saini
77a9f6f2bd
Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev
...
am: 7e7f82a
* commit '7e7f82acf5e0ac9cfbef6016c53a3faf5d2a722d':
Changes SetupRedactionInterstitial to be an optional step
2016-03-28 22:33:41 +00:00
Ajay Nadathur
b5ae28d84c
Merge "NPE on "Nexus Imprint"" into nyc-dev
...
am: 69a97d7
* commit '69a97d7f5dff23a3ba26844abcad08416e4b13df':
NPE on "Nexus Imprint"
2016-03-28 22:33:39 +00:00
Anna Galusza
4065586a29
Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev
...
am: 8870706
* commit '8870706614da8244c20dc46b53376422a819a61f':
Fix padding on Font size and Display size preview screens. Bug: 27675989
2016-03-28 22:33:35 +00:00
Udam Saini
7e7f82acf5
Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev
2016-03-28 22:06:59 +00:00
Ajay Kumar Nadathur Sreenivasan
69a97d7f5d
Merge "NPE on "Nexus Imprint"" into nyc-dev
2016-03-28 21:08:27 +00:00
Anna Galusza
8870706614
Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev
2016-03-28 18:14:49 +00:00
Ajay Nadathur
7377d4fe6b
NPE on "Nexus Imprint"
...
- When no fingerprint is setup, "Nexus Imprint" crashes because
"selectableItemBackground" is not defined. (Which is referenced by
SUW's RecyclerItemAdapter)
- Added selectableItemBackground to themes.xml
bug:27853943
Change-Id: I0e4107cf92aef5e4e3853ca45af73905d38b230e
2016-03-28 11:07:50 -07:00
Geoff Mendal
ff750b5d82
Import translations. DO NOT MERGE
...
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
2016-03-28 07:42:47 -07:00
Bill Yi
2d17f93122
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-26 17:26:11 +00:00
Bill Yi
2393396422
Import translations. DO NOT MERGE
...
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
2016-03-26 00:37:09 -07:00
Christopher Tate
8d5561fc3e
Call it "Opening links" now
...
am: 13d79b2
* commit '13d79b2a252ac4bbb55e110782f5d166d1ed4db7':
Call it "Opening links" now
2016-03-26 00:16:39 +00:00
Christopher Tate
13d79b2a25
Call it "Opening links" now
...
Better labels are better.
Bug 27834016
Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
2016-03-25 15:06:25 -07:00
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
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
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
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
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
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
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
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
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
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
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
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