Commit Graph

15886 Commits

Author SHA1 Message Date
Charles He
2a3513673f VPN settings: add missing string resource am: 1b5015cae6
am: eea0037272

Change-Id: I098bd31a201e89d17f849262ac1c0cc81b43218f
2017-04-01 20:50:57 +00:00
Charles He
eea0037272 VPN settings: add missing string resource
am: 1b5015cae6

Change-Id: I02c4ebe3d03cf4cd10c7d7803532433d519ff4e2
2017-04-01 20:47:57 +00:00
Charles He
1b5015cae6 VPN settings: add missing string resource
Previously, a string resource was deleted by mistake in commit
cce4e61260. This bug went uncaught by
local and presubmit build checks. We add the missing string back to
strings.xml to fix the build. The affected string is referenced in
ManageablePreference.java.

Apologies for any inconvenience.

Test: make SettingsRoboTests; manually navigate through VPN settings
Bug: 36815998
Change-Id: Ibc2ef9ad43cad73ef5f078714faf5c52bc7198c6
2017-04-01 18:37:10 +00:00
Bartosz Fabianowski
9f7308baad Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
am: 5569816021

Change-Id: I5b8286dce56e89ae924166d142785d52af4eb6bd
2017-04-01 05:20:07 +00:00
Bartosz Fabianowski
1e67d8902c Merge "Device management info: Refer to current user, not primary user" into oc-dev
am: 57a0771bf5

Change-Id: I65756248e8803b140277bb84a17e3c965ced0f11
2017-04-01 05:18:30 +00:00
TreeHugger Robot
5569816021 Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev 2017-04-01 05:17:10 +00:00
TreeHugger Robot
57a0771bf5 Merge "Device management info: Refer to current user, not primary user" into oc-dev 2017-04-01 05:12:39 +00:00
Jesse Evans
aabcca5187 Merge "Adds the lightning badge for Instant Apps" into oc-dev
am: ef64404f44

Change-Id: Iaae54c4ccf9656b14e7bbaa24a8979eadfbc2e5d
2017-04-01 05:05:55 +00:00
Suprabh Shukla
cb044f7045 Merge "Disabling switch preference when unknown sources are blocked" into oc-dev
am: 8e7b655dc0

Change-Id: I8533c4328476bfe4501f277cd697526033b3dd0a
2017-04-01 05:04:33 +00:00
TreeHugger Robot
ef64404f44 Merge "Adds the lightning badge for Instant Apps" into oc-dev 2017-04-01 04:59:53 +00:00
TreeHugger Robot
8e7b655dc0 Merge "Disabling switch preference when unknown sources are blocked" into oc-dev 2017-04-01 04:59:33 +00:00
Suprabh Shukla
6221a5b8d2 Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.

Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test

Bug: 34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Merged-In: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
2017-04-01 02:58:00 +00:00
Suprabh Shukla
d9a3f31019 Merge "Disabling switch preference when unknown sources are blocked" 2017-04-01 02:40:22 +00:00
Stephen Chen
bb0de14f97 Improve responsiveness of toggling wifi and refactor user restriction logic. am: 19b74d9213
am: 40adeaf28a

Change-Id: I5cbd3b05d16a64ffd488db739d87b2043347ccca
2017-04-01 01:30:51 +00:00
Stephen Chen
40adeaf28a Improve responsiveness of toggling wifi and refactor user restriction logic.
am: 19b74d9213

Change-Id: I0d776b5e4325782b9c6ad05beae51ca7e902fd22
2017-04-01 01:28:51 +00:00
Suprabh Shukla
cb9164ad48 Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.

Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test

Bug: 34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
2017-03-31 16:16:20 -07:00
Stephen Chen
19b74d9213 Improve responsiveness of toggling wifi and refactor user restriction logic.
Moved logic for handling wifi state changes into correct listener
method. Changed logic for handling isUiRestricted. This should
streamline toggling flow for WiFi both when Wifi Scanning is on and off,
and in guest mode.

Bug: 36724409
Bug: 36711085
Bug: 36398321

Test: make, test cases in tracking bug
Change-Id: I69fe07369db192c94f81dd678087ac4e8c35197b
2017-03-31 15:47:43 -07:00
Peter Qiu
2dd96f613f Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev am: 82e2239c54
am: 1599dde849

Change-Id: I242b555fabaed85a72e4f1d38b177cd90071c371
2017-03-31 18:04:17 +00:00
Peter Qiu
1599dde849 Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
am: 82e2239c54

Change-Id: I5746669f3e2f2157548979d9317bbe6a225bb715
2017-03-31 17:58:58 +00:00
TreeHugger Robot
82e2239c54 Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev 2017-03-31 17:54:18 +00:00
Bartosz Fabianowski
1fca17ce2e Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
(cherry picked from commit b836da263d)
2017-03-31 09:26:12 +00:00
TreeHugger Robot
901c8e8e6e Merge "Device management info: Refer to current user, not primary user" 2017-03-31 09:25:25 +00:00
Jesse Evans
0b7037c24e Adds the lightning badge for Instant Apps
Adds the lightning bolt badge for Instant Apps to the
InstalledAppDetails page.

Test: Robolectric test to ensure the badge is shown for Instant Apps
and also that it is not shown for installed apps.

Bug: 36512295
Change-Id: I8496d684fa3a9dc316fa5af16399e6d07f68255a
(cherry picked from commit 2400d31651)
2017-03-31 02:26:15 +00:00
TreeHugger Robot
e1b12751cb Merge "Fix mvno match data is incorrect for APNs" into oc-dev 2017-03-31 01:00:17 +00:00
Amin Shaikh
cfa0941535 Merge "Fix write wifi config to nfc." into oc-dev am: 6889ac21ab
am: ad47cd05c7

Change-Id: I17cde24b9367d0fa0fec8347856636f28d839f09
2017-03-31 00:05:46 +00:00
Amin Shaikh
ad47cd05c7 Merge "Fix write wifi config to nfc." into oc-dev
am: 6889ac21ab

Change-Id: I2e019122d85b00f700f64cb18c0a6d3f35709ac0
2017-03-31 00:03:48 +00:00
TreeHugger Robot
6889ac21ab Merge "Fix write wifi config to nfc." into oc-dev 2017-03-30 23:59:34 +00:00
Wei Huang
d4cfac304a Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.

[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.

Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 15:54:14 -07:00
Amit Mahajan
82d5f1b85f Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d am: 9df297d566
am: 7e09d39dd9

Change-Id: I2125086775f801ec35c49d8e49e1cf87a11bb5a1
2017-03-30 22:12:41 +00:00
Amit Mahajan
7e09d39dd9 Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d
am: 9df297d566

Change-Id: I152d6451b5da34880b476e15fe7d6ce95a3fe0b4
2017-03-30 22:10:42 +00:00
Amit Mahajan
9df297d566 Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de
am: 33e9e31a3d

Change-Id: I5cae77d8f81a07ad6e10901a2f4b51ae700c6189
2017-03-30 22:08:12 +00:00
Amit Mahajan
33e9e31a3d Merge "Fix mvno match data is incorrect for APNs"
am: a604afe5de

Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
2017-03-30 22:05:41 +00:00
Amit Mahajan
a604afe5de Merge "Fix mvno match data is incorrect for APNs" 2017-03-30 21:59:35 +00:00
Amin Shaikh
f6c62a2e66 Fix write wifi config to nfc.
aog/340881 converts the NFC token hex string to lowercase instead of
uppercase. This change updates Settings to encode the password as a
lowercase hex string.

Bug: 35725168
Test: m RunSettingsRoboTests and manually testing writing GIN-2G to nfc
Change-Id: I85e991c4b8a3d7634dea7f945a23a2ef3d3fe448
2017-03-30 14:44:42 -07:00
Stephen Chen
db45e51514 Merge "Add link speed to Wifi details page." into oc-dev am: 0df5281fe6
am: 659c66a3ca

Change-Id: I89b6bdfabf841f8027ae5c6870ec9ec40b8388bc
2017-03-30 18:25:32 +00:00
Stephen Chen
659c66a3ca Merge "Add link speed to Wifi details page." into oc-dev
am: 0df5281fe6

Change-Id: Ibcd26de73f4b859661ad976066cc7dc40ed45b97
2017-03-30 18:23:46 +00:00
Stephen Chen
e280e2df66 Merge "Do not show progress bar when disabling wifi." into oc-dev am: 555d12b427
am: 69bc8c5632

Change-Id: I1922192819c9e1e0db12507c4580833529d6286b
2017-03-30 18:20:50 +00:00
TreeHugger Robot
0df5281fe6 Merge "Add link speed to Wifi details page." into oc-dev 2017-03-30 18:19:45 +00:00
Stephen Chen
69bc8c5632 Merge "Do not show progress bar when disabling wifi." into oc-dev
am: 555d12b427

Change-Id: I3f35dda59aaec348998dc86c2f7b7874917c6719
2017-03-30 18:15:04 +00:00
TreeHugger Robot
555d12b427 Merge "Do not show progress bar when disabling wifi." into oc-dev 2017-03-30 18:08:46 +00:00
Robin Lee
1be80d2287 Merge "VPN: uncheck lockdown if always-on is off" into oc-dev am: 73455096d7
am: a0e34f020a

Change-Id: Ic95e31908525fb12c83e010352260d42cc2738b0
2017-03-30 18:06:45 +00:00
Robin Lee
a0e34f020a Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
am: 73455096d7

Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc
2017-03-30 18:03:56 +00:00
TreeHugger Robot
73455096d7 Merge "VPN: uncheck lockdown if always-on is off" into oc-dev 2017-03-30 17:57:16 +00:00
Matthew Fritze
6f2ca7a510 Merge "Reserve full indexing for SearchFragment" into oc-dev am: 1261a679bf
am: 64142d2f7a

Change-Id: Ice26ec2570c0aede992078dab213d7f1576a87c3
2017-03-30 16:58:10 +00:00
Matthew Fritze
64142d2f7a Merge "Reserve full indexing for SearchFragment" into oc-dev
am: 1261a679bf

Change-Id: Ia08fd77a634efd19a13982f1c4f89501e6a24c4f
2017-03-30 16:51:04 +00:00
TreeHugger Robot
1261a679bf Merge "Reserve full indexing for SearchFragment" into oc-dev 2017-03-30 16:48:53 +00:00
Robin Lee
b8b310df17 VPN: uncheck lockdown if always-on is off
Change-Id: I00933e0c8567997d800f9f31f78c7b19922a52b8
Fix: 36713605
Test: make RunSettingsRoboTests -j30
2017-03-30 16:01:02 +00:00
Bartosz Fabianowski
b836da263d Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
2017-03-30 16:18:44 +02:00
Wei Huang
ec5109ab6d Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.

[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.

Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 22:48:17 +09:00
Bartosz Fabianowski
578b02f33c Keep EnterprisePrivacySettingsActivity always enabled
The existing code checks during Settings startup whether the device is
managed. If it is not, EnterprisePrivacySettingsActivity is disabled.
If the device then becomes managed, Settings will not notice until
the next restart, causing any attempt to launch this Activity via an
Intent to crash.

This CL changes things so that the Activity is always enabled but
simply does nothing when launched on a non-managed device.

Bug: 34122104
Test: Integration test coming in a separate CL
Change-Id: I0a1dfcb41b405d981309696d97678df6787b4f72
(cherry picked from commit 92d25fb5f3)
2017-03-30 08:28:02 +00:00