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
Aran Ink
6bf5b847f6
Merge "Create Settings preference for Global Actions Panel." into qt-dev
...
am: 70313a4600
Change-Id: Ied8fd12055503411fcb8e33cb40e241668a8d567
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
Change-Id: I2a348a91956be4f6cf6c42785cf0894816b6eed9
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
Change-Id: I9642829f5d22e4641fa1627e13ae8d3fa48c493c
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
Change-Id: If93403e0b92176a54a982ffc2fbbfa5e42894756
2019-05-07 21:27:37 -07:00
Yi-Ling Chuang
0f75eb550e
Add null check before setting the visibility of swipe background
...
Some contextual cards does not allow card dismissal, so they won't have
swipe background declared in the layout file. Add null check to prevent
from NPE.
Fixes: 132209310
Test: robotests & launch Settings
Change-Id: I31f897f445c4901d007c8187fe69aea416b915d1
2019-05-08 12:04:36 +08:00
Winson Chung
46b356d37d
Merge "Disable settings preferences when the packages do not exist" into qt-dev
2019-05-08 03:47:09 +00:00
Fan Zhang
83ff47b4d1
Merge "Add an interface that returns time spent text for app." into qt-dev
...
am: 6e8c403360
Change-Id: I0e015174b752787eecba1be40937de42ebff19f9
2019-05-07 18:22:13 -07:00
TreeHugger Robot
6e8c403360
Merge "Add an interface that returns time spent text for app." into qt-dev
2019-05-08 00:11:32 +00:00
Antony Sargent
4bb253358b
Fix two problems related to data connectivity in the multi-SIM header
...
When you have multiple active SIMs, the Network & internet page has a
header showing entries for each one, with summary text indicating which
one is used for data (and whether it is just set as the default, or
actively using data). We were not properly setting this text when either
data wasn't being used, eg when connected to wifi, or mobile data was
disabled for this SIM. This CL fixes both these problems by adding new
helper classes to listen for relevant events.
Test: make RunSettingsRoboTests
Fixes: 124394250
Fixes: 128857712
Change-Id: I34f2679752fa41a50247dd0b12581cbfd77a34f6
2019-05-07 16:10:52 -07:00
Daniel Solomon
8a38791509
Merge "Hide display white balance setting depending on accessibility" into qt-dev am: 11b68bc420
...
am: b907794aa3
Change-Id: Ia6389a2a35414b60bf7fcb0f742fef1314438383
2019-05-07 15:17:04 -07:00
Daniel Solomon
b907794aa3
Merge "Hide display white balance setting depending on accessibility" into qt-dev
...
am: 11b68bc420
Change-Id: Ia7e0f7dc5accacb00b9981bac0b143b41a1984c1
2019-05-07 14:36:31 -07:00
Fan Zhang
547c975bcc
Add flag to disable part of event_logging in Settings.
...
- Fork SettingsEventLogWriter from EventLogWritter. This is identical to
the base class except it overrides some logging method with a flag
check. We can't entirely disable event_log logging because some of the stuff
being logged will not exist in stats_log, for example paired metadata.
Bug: 129697155
Test: robotest
Change-Id: I9cd46bbb54cb85737bbf7760e315c1fe34f77498
2019-05-07 14:23:23 -07:00
Daniel Solomon
11b68bc420
Merge "Hide display white balance setting depending on accessibility" into qt-dev
2019-05-07 21:19:36 +00:00
Aaron Heuckroth
2659c0f61b
Create Settings preference for Global Actions Panel.
...
Test: Automated tests pass.
Bug: 127295457
Change-Id: I6502d4c8541a3f279fb96d5f050f13890db8f376
2019-05-07 16:27:59 -04:00
Winson Chung
cfd0a66f7b
Disable settings preferences when the packages do not exist
...
Bug: 131273934
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest
Change-Id: I5b12831d0eacbaa9c8b13d7a7b380b8c99f20009
2019-05-07 20:16:05 +00:00
Edgar Wang
133ffc9c57
Show admin dialog when preference is disabled by Device Admin
...
Fixes: 130694312
Test: manual & robotest
Change-Id: I9c6487ac056ec3d784bd6f6901e96869e27e0b3e
2019-05-08 02:04:05 +08:00
Yi-Ling Chuang
d26db3793f
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev am: 9fcb35a009
...
am: 922ecb6628
Change-Id: Ie3af39287ecdd7d60749ddb883f686d04853301a
2019-05-07 08:58:28 -07:00
Yi-Ling Chuang
922ecb6628
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
...
am: 9fcb35a009
Change-Id: I47970b4ad73a3eb22367c0151c671d1c6016ee4d
2019-05-07 08:47:48 -07:00
TreeHugger Robot
9fcb35a009
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
2019-05-07 15:34:24 +00:00
Arc Wang
ac75faa207
Fix back arrow in wifi settings "connect to this network connection qr code" does not work
...
When clicking back button, pop fragment and Finish the activity if there is nothing to pop
Bug: 132132756
Test: atest WifiDppConfiguratorActivityTest
Change-Id: Ia16951e79e578f1625e5fadd26553735fa90bffa
2019-05-07 18:06:54 +08:00