Jeff Sharkey
019946868e
Merge "Don't try using a detached fragment." into oc-dev
...
am: b59337c0eb
2017-04-04 01:26:59 +00:00
TreeHugger Robot
b59337c0eb
Merge "Don't try using a detached fragment." into oc-dev
2017-04-04 01:18:11 +00:00
Jeff Sharkey
5e2fc68668
Don't try using a detached fragment.
...
Test: builds, boots
Bug: 36486843
Change-Id: I3e2d2bcd56edcc86370f4b64dabdf155d63f40d3
2017-04-03 17:19:19 -06:00
Doris Ling
03ee253701
Add summary text to Display->Brightness level.
...
Get the current brightness level from settings provider and set it to
the brightness preference summary.
Change-Id: Ieb4fbc132ec120cf839548f64e9c5f5b52b2f9c2
Fix: 36650108
Test: make RunSettingsRoboTests
2017-04-03 15:26:30 -07:00
TreeHugger Robot
b4e7b17223
Merge "Add AvailableVirtualKeyboardFragment to TV"
2017-04-03 22:04:18 +00:00
Sean Stout
062512641e
Added Night Light Suggestion and tests
...
Bug: 34900174
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Change-Id: I5b2d4e5debc1403cfcbf9c6ecf9397d1074e3a29
2017-04-03 14:46:25 -07:00
Maurice Lam
ca022e2b9b
Merge "Fix suggested action custom view binding"
2017-04-03 21:38:20 +00:00
Maurice Lam
68d6bcd18a
Merge "Rebuild suggestions when suggestions are dismissed"
2017-04-03 21:37:59 +00:00
Doris Ling
3ff3b81827
Update USb preference controller to use the new summary texts.
...
- since the choose usb mode dialog and the preference summary use
separate strings now, the two classes can have their own handling
for getting the title/summary text and hence revert the earlier
change that move the setTitle() and setSummary() from the activity
to controller
- only show summary for the option for "supply power", and don't set
summary for all other options
- update the controller to use the new summary text.
- update test correspondingly.
Change-Id: Ie56eb33ba24262e6f3a2259e4ee5ad6f3bfb8061
Fix: 36234108
Test: make RunSettingsRoboTests
2017-04-03 13:53:11 -07:00
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
fb3bdd7ed4
Merge "Add friction icon for metered networks." into oc-dev am: 9b271041a9
...
am: c1288e2630
2017-04-03 18:51:58 +00:00
Stephen Chen
c1288e2630
Merge "Add friction icon for metered networks." into oc-dev
...
am: 9b271041a9
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
Hemant Gupta
06dc823fb7
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e am: b5e14d5f30
...
am: ec6815ea7c
2017-04-03 18:40:19 +00: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
2017-04-03 17:57:42 +00:00
Hemant Gupta
b5e14d5f30
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
...
am: 2ffab51c0e
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
...
am: e270a6aa85
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
fa04ad4e8f
Fix NPE when forgetting networks. am: 3c0d5ff3d1
...
am: f73b263583
2017-04-02 21:36:50 +00:00
Amin Shaikh
f73b263583
Fix NPE when forgetting networks.
...
am: 3c0d5ff3d1
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
TreeHugger Robot
5ed1fc855e
Merge "Adds the Clear App dialog for Instant Apps"
2017-04-02 18:25:26 +00:00
Jesse Evans
ee37bd1a61
Merge "Removes summary text from Instant Apps details" into oc-dev am: 8fc0d1f948
...
am: 6ecbdadd6a
2017-04-02 16:20:33 +00:00
Jesse Evans
6ecbdadd6a
Merge "Removes summary text from Instant Apps details" into oc-dev
...
am: 8fc0d1f948
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
Jesse Evans
91c51146a4
Merge "Removes instant apps from certain screens"
2017-04-02 16:09:32 +00:00
Lei Yu
b643a0d30b
Merge "Fix crash when opening battery page"
2017-04-02 07:03:48 +00:00
Lei Yu
851e73b8a2
Merge "Ui changes in battery main page"
2017-04-02 07:03:10 +00:00
Bill Yi
760eca3d64
Import translations. DO NOT MERGE am: 66ff06da2f -s ours am: c7ca1bcf70 -s ours
...
am: ff8eb394ad
2017-04-02 04:03:21 +00:00
Bill Yi
ff8eb394ad
Import translations. DO NOT MERGE am: 66ff06da2f -s ours
...
am: c7ca1bcf70
2017-04-02 04:00:21 +00:00
Bill Yi
c7ca1bcf70
Import translations. DO NOT MERGE
...
am: 66ff06da2f
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
2a3513673f
VPN settings: add missing string resource am: 1b5015cae6
...
am: eea0037272
2017-04-01 20:50:57 +00:00
Charles He
eea0037272
VPN settings: add missing string resource
...
am: 1b5015cae6
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
2017-04-01 18:37:10 +00:00
Bartosz Fabianowski
b01ec531ee
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev am: 5569816021
...
am: 9f7308baad
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
2017-04-01 05:20:48 +00:00
Bartosz Fabianowski
9f7308baad
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
...
am: 5569816021
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
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
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
2017-04-01 05:09:30 +00:00
Jesse Evans
aabcca5187
Merge "Adds the lightning badge for Instant Apps" into oc-dev
...
am: ef64404f44
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
2017-04-01 05:04:33 +00:00
