Julia Reynolds
eb9dae04ab
Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev
...
am: befc5c5
2016-03-24 22:40:16 +00:00
Julia Reynolds
befc5c59eb
Merge "Rules without a configuration activity aren't clickable." into nyc-dev
2016-03-24 22:11:53 +00:00
Julia Reynolds
2bcb0778c3
Rules without a configuration activity aren't clickable.
...
Bug: 27823109
Change-Id: Ifa2291627846e562f9a04ec1e85582833ab234de
2016-03-24 15:10:25 -07:00
Robin Lee
32c3be8e03
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
...
am: 1997f76
2016-03-24 18:41:16 +00:00
Robin Lee
1997f76cfc
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
2016-03-24 18:32:51 +00:00
Hall Liu
736afac6cb
Merge "Add indicator for system dialer in Settings" into nyc-dev
...
am: f3dc18b
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
Robin Lee
d3041943a7
Implement action "android.settings.VPN_SETTINGS"
...
Bug: 27700919
Change-Id: Ibd23f1d53d40addc2ff8ac3215f3524b7e8c9c2e
2016-03-24 16:02:08 +00:00
Daichi Hirono
28fa685ef3
Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev
...
am: 98607d4
2016-03-24 02:50:52 +00:00
Daichi Hirono
98607d4449
Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev
2016-03-24 02:46:23 +00:00
Yorke Lee
abe553ed0d
Merge "Fix build" into nyc-dev
...
am: d0f8d92
2016-03-23 18:47:58 +00: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
0f0e2df40a
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
...
am: 45949f9
2016-03-23 18:06:22 +00:00
Sudheer Shanka
add53dfcb1
Merge "Add more policy transparency for wifi settings." into nyc-dev
...
am: ed0d4dd
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
2016-03-23 18:06:21 +00:00
Sudheer Shanka
45949f9138
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
2016-03-23 17:53:25 +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
qinglian.x.zhang
178b198f70
Merge "Fix no options menu on location settings screen"
...
am: 5c15ff9
2016-03-23 16:07:28 +00:00
Abodunrinwa Toki
14df560744
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev
2016-03-23 16:03:24 +00:00
Geoff Mendal
e4991bd6dd
Import translations. DO NOT MERGE
...
am: 9203c33
2016-03-23 14:51:17 +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
Sudheer Shanka
b5c92147ce
Add more policy transparency for disallow_remove_user restriction.
...
Bug: 27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
2016-03-22 17:24:07 -07:00
Andres Morales
130721a419
Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev
...
am: 950de0e
2016-03-22 21:34:00 +00:00
Andres Morales
950de0e40a
Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev
2016-03-22 21:20:43 +00:00
Andres Morales
0bb6f70a87
don't toggle OEM unlocking if the preference is not enabled
...
Toggling the top-level switch is bypassing the disabled
state of the switch and leaving it in an inconsistent and
unrecoverable state.
Bug: 26863852
Change-Id: I9fed626b743fd6aac2c20910493bdec4778cc629
2016-03-22 12:56:29 -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
Jason Monk
230a29a1b3
Merge "Guard against monkey crash." into nyc-dev
...
am: 9c867a5
2016-03-22 16:46:26 +00:00
Jason Monk
9c867a5703
Merge "Guard against monkey crash." into nyc-dev
2016-03-22 16:38:44 +00:00
Tony Mantler
172168131a
Merge "Move hint strings to SettingsLib" into nyc-dev
...
am: 829d517
2016-03-22 16:24:49 +00:00
Jason Monk
decc767f26
Guard against monkey crash.
...
Bug: 27784445
Change-Id: I4ba6e02e0cdb6857661a824ae0888feac6762a05
2016-03-22 09:17:12 -07:00
Tony Mantler
829d5173d8
Merge "Move hint strings to SettingsLib" into nyc-dev
2016-03-22 16:16:14 +00:00
Jason Monk
5c15ff923d
Merge "Fix no options menu on location settings screen"
2016-03-22 16:15:34 +00:00
Nathan Harold
19acb87506
Fix Crash in the WiFi Status Test Menu
...
am: 582b287
2016-03-22 02:24:29 +00:00
Daichi Hirono
0f6796284b
Don't close USB type notification when USB is connected to USB devices.
...
Previously we show a notificatino to show the UsbModeChooser when
Android is connected to another Android via USB type C cable.
However UsbModeChoooser activity was closed immediately after a user
tapped the notification, if the Android worked as host.
FIXED=27535640
Change-Id: I707dcbf1021e7381096c0ae7cc2d712892ac5a5a
2016-03-22 11:04:29 +09:00
Nathan Harold
582b287595
Fix Crash in the WiFi Status Test Menu
...
-Remove fragments of the defunct/removed ip-address ping test
-Update a dangling resource reference
Bug: 27771038
Change-Id: Ib26eb6427eb6fbe6ef2d1f235277af3d2e8093f1
2016-03-21 23:22:55 +00:00
Tony Mantler
50124b5fee
Move hint strings to SettingsLib
...
b/18246360
Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
2016-03-21 14:51:55 -07:00
Tony Mak
1a7d856984
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
...
am: 147fa9f
2016-03-21 15:25:39 +00:00
Victor Chang
d0fc82fd66
Merge "Per vpn setting change in VPN list" into nyc-dev
...
am: 32da1ec
2016-03-21 15:25:39 +00:00
Tony Mak
147fa9f542
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
2016-03-21 15:20:34 +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
6c1a8ae669
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 6aad5a1
2016-03-21 14:52:33 +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
Victor Chang
dcb3f2f3fd
Merge "Vpn settings per vpn" into nyc-dev
...
am: df21cc7
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
