Commit Graph

35050 Commits

Author SHA1 Message Date
Doris Ling
c5f4120484 Update summary for Connected devices->Printing.
The summary text now shows the number of enabled print services. Update
the flag to only select enabled service from PrintManager.

Bug: 36234108
Test: make RunSettingsRoboTests
Change-Id: I81e1584182edd1f290faa941c7d3ee711a9d67b8
2017-04-03 13:42:26 -07:00
Daniel Nishi
1ee13fd386 Update the automatic storage management preferences.
This updates this page to match the newer mocks. The changes
include:

* Changing the toggle from a switch to a switch bar.
* Removing the Deletion Helper flow from the screen.
* Unit testing the previously untested functionality.

Change-Id: I35eb1e065c9acfbf32a64d659d35e18034025472
Fixes: 36486021
Test: Robotest
2017-04-03 13:05:08 -07:00
Daniel Nishi
38a2a5f425 Fix a unit test regression.
This fixes a StorageSettingsTest regression where the percentage
was no longer being formatted correctly for the test.

Change-Id: I71e03926ad8b3691cebc26aea11e8557c2ba0fea
Fixes: 36858638
Test: Settings Robotest
2017-04-03 13:01:27 -07:00
Sundeep Ghuman
d2831c31c1 Create Espresso test class for WifiSettings.
Bug: b/36403696
Test:  runtest --path
packages/apps/Settings/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I91306880f620c4a05bfdce35360a1edbcd8a15b7
2017-04-03 12:28:40 -07:00
Maurice Lam
957fc67af2 Disable SetupRedactionInterstitial when complete
When RedactionInterstitial is complete, there is no need to show the
SetupRedactionInterstitial as optional step anymore. Disable it via
package manager when RedactionInterstatial completes.

Test: Manual
Bug: 36696006
Change-Id: I3fd421d6a8a0d24d7ebbe8c1e688a10e00067f2f
2017-04-03 12:09:37 -07:00
Stephen Chen
c1288e2630 Merge "Add friction icon for metered networks." into oc-dev
am: 9b271041a9

Change-Id: Ic78a948751317a5536a8ee52825c74672b9a7996
2017-04-03 18:40:34 +00:00
Doris Ling
5853f9742f Update Wifi off summary text.
Changed the test from "disabled" to off when wifi is turned off.

Fix: 36296257
Test: make RunSettingsRoboTests
Change-Id: Iae421c15b812fa7a5c3ec841e9d2c28d21063884
2017-04-03 11:40:23 -07:00
TreeHugger Robot
9b271041a9 Merge "Add friction icon for metered networks." into oc-dev 2017-04-03 18:24:02 +00:00
Hemant Gupta
ec6815ea7c Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e
am: b5e14d5f30

Change-Id: Ie2246c812f6a34086c19561f62e73f714bdd8eff
2017-04-03 17:57:42 +00:00
Hemant Gupta
b5e14d5f30 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
am: 2ffab51c0e

Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am: e270a6aa85

Change-Id: Ia5108737add480f2cce52663f13d496653c37320
2017-04-03 17:50:36 +00:00
Treehugger Robot
e270a6aa85 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" 2017-04-03 17:43:42 +00:00
Amin Shaikh
f73b263583 Fix NPE when forgetting networks.
am: 3c0d5ff3d1

Change-Id: I713d50e7ecf31b95990afba7c26e2c0d54177f10
2017-04-02 21:33:55 +00:00
Amin Shaikh
3c0d5ff3d1 Fix NPE when forgetting networks.
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed

Bug: 36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
2017-04-02 12:19:42 -07:00
Jesse Evans
6ecbdadd6a Merge "Removes summary text from Instant Apps details" into oc-dev
am: 8fc0d1f948

Change-Id: I806826bd2b7ee5435f132d9f3db234878b9b429f
2017-04-02 16:17:35 +00:00
Jesse Evans
8fc0d1f948 Merge "Removes summary text from Instant Apps details" into oc-dev 2017-04-02 16:13:54 +00:00
Bill Yi
ff8eb394ad Import translations. DO NOT MERGE am: 66ff06da2f -s ours
am: c7ca1bcf70  -s ours

Change-Id: I7d981104f749677ecdb1560903c9b2720fdf1c73
2017-04-02 04:00:21 +00:00
Bill Yi
c7ca1bcf70 Import translations. DO NOT MERGE
am: 66ff06da2f  -s ours

Change-Id: I82b52721cd65db19cbdcc0c4d062ab4875a9d6f6
2017-04-02 03:58:11 +00:00
Bill Yi
66ff06da2f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I940468be84cb7790fb9c205c3648e526a4b32422
2017-04-01 16:45:18 -07: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
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
40adeaf28a Improve responsiveness of toggling wifi and refactor user restriction logic.
am: 19b74d9213

Change-Id: I0d776b5e4325782b9c6ad05beae51ca7e902fd22
2017-04-01 01:28:51 +00:00
Stephen Chen
dee09e7a5a Add friction icon for metered networks.
Also modified colors for dark theme compatibility.

Bug: 36100548
Bug: 36099721
Test: make, screenshot
Change-Id: Ib19ba8d5f34ad6d7461849c9137520308f1e5e34
2017-03-31 17:44:18 -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
11b224e34f Re-order the display settings items.
Move Night light and Adaptive brightness up.

Change-Id: Ic5302e26e1c5c6c74fea955ad90723c2eeb94a31
Fix: 35959978
Test: visual
2017-03-31 13:14:03 -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
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
Jesse Evans
15c7f5fda4 Removes summary text from Instant Apps details
Test: Robolectric test to ensure header item is GONE.

Bug: 36512295
Change-Id: I020e90d6521c853e67ae600e5786445a8469a934
(cherry picked from commit 14a258443f)
2017-03-31 02:27:53 +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
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
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
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
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