Commit Graph

34508 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
b01ec531ee Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev am: 5569816021
am: 9f7308baad

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

Change-Id: I32c82556b755aa4d5fdbde1492b1316578cf5b21
2017-04-01 05:20:48 +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
14ade275fc Merge "Adds the lightning badge for Instant Apps" into oc-dev am: ef64404f44
am: aabcca5187

Change-Id: Ib35dafd0371efc61ba815893f5839873f11aadeb
2017-04-01 05:11:14 +00:00
Suprabh Shukla
d7b6a97715 Merge "Disabling switch preference when unknown sources are blocked" into oc-dev am: 8e7b655dc0
am: cb044f7045  -s ours

Change-Id: Ie8f07b6536457c24b7606336e114f2c046396e64
2017-04-01 05:09:30 +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
TreeHugger Robot
ab13d8990f Merge "Change test type from InstrumentationTest to AndroidJUnitTest" 2017-04-01 04:49:19 +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
Doris Ling
3b9458d341 Merge "Update text for USB mode selection dialog." into oc-dev am: 23accd2179
am: 8a6d2ed429

Change-Id: I3c1dcb2d8fc2402f87726b3e9c9a836f823a4241
2017-04-01 02:10:22 +00:00
Doris Ling
8a6d2ed429 Merge "Update text for USB mode selection dialog." into oc-dev
am: 23accd2179

Change-Id: Ia48fba32cdbd027ffe052016b0d8d3f3ee250993
2017-04-01 02:08:25 +00:00
TreeHugger Robot
23accd2179 Merge "Update text for USB mode selection dialog." into oc-dev 2017-04-01 02:03:27 +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
Doris Ling
a2fdd19e0b Update text for USB mode selection dialog.
- create separate strings to be used for the USB preference summary.
- reverted the previous changes made to change the verb in the usb
preference title.
- updated the summary text for the usb selection description for charge
only.

Bug: 36234108
Test: builds
Change-Id: I4a57ecd6f9be4b3c10885ac1bbba76ff3df02b84
2017-03-31 11:09:07 -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
Bill Yi
0a50e87693 Merge "Import translations. DO NOT MERGE" into oc-dev am: e52758588a -s ours
am: e049c3523f  -s ours

Change-Id: I7a46c24127ca51b64028771b53dbf9990ca6593f
2017-03-31 02:10:12 +00:00
Bill Yi
e049c3523f Merge "Import translations. DO NOT MERGE" into oc-dev
am: e52758588a  -s ours

Change-Id: I6e9cbf23b8f49ad32a30092021485a54f1e076dc
2017-03-31 02:06:22 +00:00
TreeHugger Robot
e52758588a Merge "Import translations. DO NOT MERGE" into oc-dev 2017-03-31 01:57:06 +00:00
Wei Huang
29a744cfd6 Merge "Fix mvno match data is incorrect for APNs" into oc-dev am: e1b12751cb
am: e790338ed6

Change-Id: I0bc5fe6832ffd03e65d89630e0e99d87550ba71a
2017-03-31 01:23:40 +00:00
Wei Huang
e790338ed6 Merge "Fix mvno match data is incorrect for APNs" into oc-dev
am: e1b12751cb

Change-Id: I82b8798e64b4b7f9958e3e88a7fe195df57e3549
2017-03-31 01:05:17 +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
Bill Yi
0ada77e203 Import translations. DO NOT MERGE
Change-Id: Ic117b670e525612d9f243eff4f151d9ee616d198
Auto-generated-cl: translation import
2017-03-30 15:09:46 -07: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
Bartosz Fabianowski
ddf596da14 Merge "Remove android:visibility attributes from Preferences" into oc-dev am: b9f570ff44
am: 103a72a9eb

Change-Id: Ifdbaeb05fd497bfa58c2e6f4abe89e420d7de2cf
2017-03-30 20:10:54 +00:00