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
64d39af2ca
Merge "Guard against monkey crash." into nyc-dev am: 9c867a5
...
am: 230a29a
* commit '230a29a1b3989298fddea4180f41bad4617d6d10':
Guard against monkey crash.
2016-03-22 16:49:13 +00:00
Jason Monk
230a29a1b3
Merge "Guard against monkey crash." into nyc-dev
...
am: 9c867a5
* commit '9c867a5703e36f47ec0f6b52fd1dc8b7d3110802':
Guard against monkey crash.
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
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
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
63859ab2c0
Fix Crash in the WiFi Status Test Menu am: 582b287
...
am: 19acb87
* commit '19acb87506e4bc14d611fd323c75e5ccaadf142c':
Fix Crash in the WiFi Status Test Menu
2016-03-22 02:27:18 +00:00
Nathan Harold
19acb87506
Fix Crash in the WiFi Status Test Menu
...
am: 582b287
* commit '582b28759551413454a7bf3e5e9e919030ceca33':
Fix Crash in the WiFi Status Test Menu
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
b70f3b03e5
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev am: 147fa9f
...
am: 1a7d856
* commit '1a7d8569840c23099bf39aadc990640f916ef516':
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
2016-03-21 15:28:15 +00: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
Tony Mak
1a7d856984
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
...
am: 147fa9f
* commit '147fa9f542a5509f64009548af221729a66138f5':
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
2016-03-21 15:25:39 +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
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
5fe8495b9f
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6aad5a1
-s ours
...
am: 6c1a8ae
-s ours
* commit '6c1a8ae669dfc762bca0230ab7a7d82d2601c279':
Import translations. DO NOT MERGE
2016-03-21 14:54:49 +00:00
Geoff Mendal
6c1a8ae669
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 6aad5a1
-s ours
* commit '6aad5a1bda4ca018cf9afd6afb982d7646a619de':
Import translations. DO NOT MERGE
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
Geoff Mendal
288e1d1682
Merge "Import translations. DO NOT MERGE"
2016-03-21 13:47:06 +00: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
cad4684d40
Merge "Import translations. DO NOT MERGE"
2016-03-19 03:57:40 +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
7c2095c048
Import translations. DO NOT MERGE am: 5f96b25
-s ours
...
am: 670a9c7
-s ours
* commit '670a9c7b9820fa7c087a9006c3e5d7ced78b405a':
Import translations. DO NOT MERGE
2016-03-19 03:24:34 +00:00
Geoff Mendal
670a9c7b98
Import translations. DO NOT MERGE
...
am: 5f96b25
-s ours
* commit '5f96b25dae8092ed5173ae89948515f1c2848f6f':
Import translations. DO NOT MERGE
2016-03-19 03:21:56 +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
533b955766
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev am: e9b5d59
...
am: 77e429b
* commit '77e429b27e24ff825053e48422b40b99aa9e73bd':
Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791
2016-03-18 21:44:24 +00:00
Anna Galusza
77e429b27e
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev
...
am: e9b5d59
* commit 'e9b5d5980bb6b6fab60c1224375201dc31fafc8b':
Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791
2016-03-18 21:41:30 +00: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
Tony Mak
a7b25f9e71
Merge "Should read specific user\'s password restriction" into nyc-dev am: 2bfbcfa
...
am: d1af8c2
* commit 'd1af8c2d6ac6ea858e67022ff76a0f938bfc5ad4':
Should read specific user's password restriction
2016-03-18 18:57:00 +00:00
Tony Mak
ac3471c7b9
Clear mHasResult if the result is dispatched am: b27d5b2
...
am: b03e5ec
* commit 'b03e5ece2d4e27bccc681404ed755d7ce4908559':
Clear mHasResult if the result is dispatched
2016-03-18 18:57:00 +00:00
Tony Mak
d1af8c2d6a
Merge "Should read specific user\'s password restriction" into nyc-dev
...
am: 2bfbcfa
* commit '2bfbcfae13afd00b7e7e28031a9bda5f7de753f8':
Should read specific user's password restriction
2016-03-18 18:54:45 +00:00
Tony Mak
b03e5ece2d
Clear mHasResult if the result is dispatched
...
am: b27d5b2
* commit 'b27d5b2007020e9911aaab57161bced168d3b99c':
Clear mHasResult if the result is dispatched
2016-03-18 18:54:45 +00:00
Tony Mak
2bfbcfae13
Merge "Should read specific user's password restriction" into nyc-dev
2016-03-18 18:51:58 +00:00