Kevin Chang
d3496412f7
Override performClick method to eliminate redundant click
...
Bug: 132226328
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SwitchBar
Change-Id: I22987a7695dfc84e50d6419604a9512f98cf4d13
2019-05-10 11:52:24 +08:00
hughchen
095c5be448
Clear media switcher items when in phone call
...
- update test case
Bug: 132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: I2bbd35e869e8ab5596d280d04fddc98f05629190
2019-05-10 10:27:26 +08:00
Raff Tsai
6f162ee6f8
Merge "Fix robolectric test error" into qt-dev am: c617fa2e87
...
am: 8eed7ab16b
Change-Id: I85f13ff20bb7089b5b0e6021e8b6712e74e35480
2019-05-09 18:15:07 -07:00
Pengquan Meng
0ab776f69d
Fixed network name for about/sim_status
...
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.
Bug: 31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
2019-05-09 15:16:20 -07:00
Raff Tsai
8eed7ab16b
Merge "Fix robolectric test error" into qt-dev
...
am: c617fa2e87
Change-Id: I34539bf27f4dd4cf56e35f9e039529f68104d060
2019-05-09 13:30:16 -07:00
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
Change-Id: I68e0fc083ea7557a953f14f560b21caca0873261
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
Change-Id: I3c74212e9efa6227f5c591080f3b593fb7e42b5a
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
Change-Id: Id779383a7216a53cc41c96eea76265c0a6b06105
2019-05-08 20:27:49 -07:00
tmfang
a3345935bd
Merge "Fix WebViewAppPickerTest" into qt-dev
...
am: 28006039c5
Change-Id: Ie0baea1d62d5d3c04b5af48a73c2ff5f3a9a40a8
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
Change-Id: If6b45a274e22f0bc8c60b2276a0db39778bd2b34
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
Change-Id: I01bb48fc8bf405d6d807630e01e1f03a14432f9f
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
Change-Id: Idd12b811d0dfd5805a626c97c8c422c3cd7b4e4a
2019-05-08 15:14:40 -07:00
Alex Salo
925c6c0e68
Merge "Re-enable the test" into qt-dev am: 95c26b67f1
...
am: ee9f413a0f
Change-Id: Iad9f54f7ec685e116bd9e835296ebb0d9eb38ef4
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
Change-Id: I5425c23716ad8118a6313433545c783f55bf7db4
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
Change-Id: Ide094fdbacadb8ea40f2e3b0bad32a8d9644ebe5
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
Change-Id: I01c46e99d6c320350a2cbffa6d9017cacfe0bd02
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
Change-Id: If57f2b5b8170d3f6ae303d8572244c97c6c94727
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
Change-Id: Iaf752753accb6324bcdc595fcd58042ca83ef7fd
2019-05-08 14:07:00 -07:00
Lei Yu
ddf3268ad1
Merge "Add null check when restart batteryinfo loader" into qt-dev
...
am: 285fc7f7c3
Change-Id: I75c8925d1b4b0707eb58de2e46f94c539e091e56
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
Change-Id: I8749dc6fb2ef0081ff1bbd5eef2dfbb01f0c97d2
2019-05-08 13:14:29 -07:00
Lei Yu
f3cd7b6b17
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
...
am: 2ace95f386
Change-Id: I09ff46fcb21181976bc96381e9cbc74bf13b6030
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
Change-Id: I037e45145b925c1d662bd331025f11f7b57e513b
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
Change-Id: I32b1142594b2aff558cc3e39e022ea1dfea503dc
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
Change-Id: I091ddf8b00531ca5a756d30c16bdee961484b7bc
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
Change-Id: I1982c2773ecfaa96c71d14bbc4551d5ab7326b79
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
Change-Id: I333059bde118000c5f4c775dda32bac52c767dd3
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
Change-Id: Iedae12a638188a5c41f67ce880171e1606a2e582
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
Change-Id: Ifa70334797f19a2c87b7c361345158e76c136509
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
Change-Id: Ifcba7bc83c390e3cb1a863b11b7d9637c0ba48a2
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
Change-Id: I9bcc36038553f37efe4925c901d5aeec3d9a84e9
2019-05-08 07:40:11 -07:00