Jason Chiu
46294872c7
Remove On/Off subtext next to the Wi-Fi toggle
...
Fixes: 132312797
Test: robotest, visual
Change-Id: I2c3b39e8deda211d23be0b2a73426778dbbf53db
2019-05-09 15:19:02 +08:00
Raff Tsai
1b28754b98
Fix robolectric test error
...
Bug: 132302277
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.AdaptiveSleepPreferenceControllerTest"
Change-Id: I6c823298d8e346eb2e87686a691dc4a2536423f6
2019-05-09 11:36:35 +08:00
tmfang
cb183220f2
Merge "Fix WebViewAppPickerTest" into qt-dev am: 28006039c5
...
am: a3345935bd
2019-05-08 20:33:40 -07:00
Arc Wang
2723563a19
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev am: 5c461a2859
...
am: 6830a691dd
2019-05-08 20:32:32 -07:00
Andrew Sapperstein
acd3a9f96d
Merge "Update summary for mobile data toggle for CBRS." into qt-dev am: cf964643b5
...
am: f8058733c2
2019-05-08 20:27:49 -07:00
tmfang
a3345935bd
Merge "Fix WebViewAppPickerTest" into qt-dev
...
am: 28006039c5
2019-05-08 19:16:45 -07:00
Arc Wang
6830a691dd
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
...
am: 5c461a2859
2019-05-08 19:11:24 -07:00
Andrew Sapperstein
f8058733c2
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
...
am: cf964643b5
2019-05-08 19:01:36 -07:00
TreeHugger Robot
28006039c5
Merge "Fix WebViewAppPickerTest" into qt-dev
2019-05-09 02:00:26 +00:00
Arc Wang
5c461a2859
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
2019-05-09 01:29:48 +00:00
TreeHugger Robot
cf964643b5
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
2019-05-09 00:51:31 +00:00
Andrew Sapperstein
477e345f21
Update summary for mobile data toggle for CBRS.
...
Fixes: 127529917
Test: robotests
Change-Id: Id2d0bdbcf9674106a3dff8db8e9ceb22dbdda314
2019-05-08 15:55:04 -07:00
Salvador Martinez
83fc48a63a
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev am: cbd925bf73
...
am: 63fb185d64
2019-05-08 15:14:40 -07:00
Alex Salo
925c6c0e68
Merge "Re-enable the test" into qt-dev am: 95c26b67f1
...
am: ee9f413a0f
2019-05-08 14:48:07 -07:00
Fan Zhang
5f91d8da42
Merge "Display settings homepage content fully edge-to-edge" into qt-dev am: c084301c02
...
am: 7f58e8cd1b
2019-05-08 14:47:07 -07:00
Salvador Martinez
63fb185d64
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
...
am: cbd925bf73
2019-05-08 14:28:12 -07:00
Lei Yu
b9974fddc4
Merge "Add null check when restart batteryinfo loader" into qt-dev am: 285fc7f7c3
...
am: ddf3268ad1
2019-05-08 14:24:40 -07:00
TreeHugger Robot
cbd925bf73
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
2019-05-08 21:12:52 +00:00
Alex Salo
ee9f413a0f
Merge "Re-enable the test" into qt-dev
...
am: 95c26b67f1
2019-05-08 14:07:58 -07:00
Fan Zhang
7f58e8cd1b
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
...
am: c084301c02
2019-05-08 14:07:00 -07:00
Lei Yu
ddf3268ad1
Merge "Add null check when restart batteryinfo loader" into qt-dev
...
am: 285fc7f7c3
2019-05-08 13:50:37 -07:00
TreeHugger Robot
95c26b67f1
Merge "Re-enable the test" into qt-dev
2019-05-08 20:29:38 +00:00
Fan Zhang
c084301c02
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
2019-05-08 20:26:31 +00:00
Lei Yu
285fc7f7c3
Merge "Add null check when restart batteryinfo loader" into qt-dev
2019-05-08 20:18:11 +00:00
Lei Yu
e0bde475a1
Merge "Update datausage for DataUsagePreferenceController" into qt-dev am: 2ace95f386
...
am: f3cd7b6b17
2019-05-08 13:14:29 -07:00
Lei Yu
f3cd7b6b17
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
...
am: 2ace95f386
2019-05-08 12:56:23 -07:00
Antony Sargent
7c27e5f88a
Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev am: ea6bd51bea
...
am: a3c46e0543
2019-05-08 12:40:01 -07:00
Salvador Martinez
fb940feebf
Clear preferences when dialog acknowledged and increase order
...
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.
Test: atest BatterySaverScheduleSeekBarControllerTest
Bug: 132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
2019-05-08 12:28:43 -07:00
TreeHugger Robot
2ace95f386
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
2019-05-08 19:20:13 +00:00
Antony Sargent
a3c46e0543
Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev
...
am: ea6bd51bea
2019-05-08 11:59:05 -07:00
Fan Zhang
3e14383a28
Display settings homepage content fully edge-to-edge
...
This is needed to support fully gesture navigation.
Bug: 132182711
Test: visual
Change-Id: Ifaf15ecec73b974356355a74e73754f95b84ad3e
2019-05-08 11:43:58 -07:00
TreeHugger Robot
ea6bd51bea
Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev
2019-05-08 18:31:39 +00:00
Lei Yu
b47b99ed38
Add null check when restart batteryinfo loader
...
Even though we unregister contentObserver in onPause and register
in onResume, callback still be called while fragment is detached.
Anyhow add a null check in settings to stop crash
Fixes: 131905853
Test: RunSettingsRoboTests
Change-Id: I8c0c2c04c3b8d942e0c97cf71a7d3e735a24b467
2019-05-08 11:12:55 -07:00
Fan Zhang
31ba39e333
Merge "Add flag to disable part of event_logging in Settings." into qt-dev am: c949d12a12
...
am: 25e5a98734
2019-05-08 11:05:52 -07:00
Edgar Wang
bc1895971b
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev am: e3278d8240
...
am: ed2e1e9a0f
2019-05-08 10:52:04 -07:00
Yi-Ling Chuang
ead58c3d6d
Merge "Add null check before setting the visibility of swipe background" into qt-dev am: 1079d2833a
...
am: 9a8717c9c0
2019-05-08 10:48:29 -07:00
Alex Salo
83a63abd2d
Re-enable the test
...
Update the test to handle new API and simplify the logic in the
controller.
Bug: 130897305
Test: make RunSettingsRoboTests -j64
Change-Id: I0c46ff22d4a3bf913add753f85a24af9aeee0a33
2019-05-08 17:48:12 +00:00
Fan Zhang
25e5a98734
Merge "Add flag to disable part of event_logging in Settings." into qt-dev
...
am: c949d12a12
2019-05-08 10:40:03 -07:00
Edgar Wang
ed2e1e9a0f
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
...
am: e3278d8240
2019-05-08 10:32:06 -07:00
Lei Yu
9bc3273489
Update datausage for DataUsagePreferenceController
...
Data usage number was wrong because we didn't set correct
subId, this CL fixes this issue.
Bug: 132113657
Test: RunSettingsRoboTests
Change-Id: If7c9cf2f4709d9a8e5f9a154c02de9484800d6d5
2019-05-08 10:25:10 -07:00
TreeHugger Robot
c949d12a12
Merge "Add flag to disable part of event_logging in Settings." into qt-dev
2019-05-08 17:15:03 +00:00
Yi-Ling Chuang
9a8717c9c0
Merge "Add null check before setting the visibility of swipe background" into qt-dev
...
am: 1079d2833a
2019-05-08 10:12:51 -07:00
TreeHugger Robot
e3278d8240
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
2019-05-08 17:03:42 +00:00
TreeHugger Robot
1079d2833a
Merge "Add null check before setting the visibility of swipe background" into qt-dev
2019-05-08 16:34:32 +00:00
Aran Ink
6e858db304
Merge "Create Settings preference for Global Actions Panel." into qt-dev am: 70313a4600
...
am: 6bf5b847f6
2019-05-08 07:40:11 -07:00
Aran Ink
6bf5b847f6
Merge "Create Settings preference for Global Actions Panel." into qt-dev
...
am: 70313a4600
2019-05-08 07:35:13 -07:00
Aran Ink
70313a4600
Merge "Create Settings preference for Global Actions Panel." into qt-dev
2019-05-08 14:16:07 +00:00
Winson Chung
14a487f821
Merge "Disable settings preferences when the packages do not exist" into qt-dev am: 46b356d37d
...
am: 0936f8f942
2019-05-07 23:24:20 -07:00
Winson Chung
0936f8f942
Merge "Disable settings preferences when the packages do not exist" into qt-dev
...
am: 46b356d37d
2019-05-07 21:29:28 -07:00
Fan Zhang
622eb0e021
Merge "Add an interface that returns time spent text for app." into qt-dev am: 6e8c403360
...
am: 83ff47b4d1
2019-05-07 21:27:37 -07:00
