TreeHugger Robot
c46da1bd47
Merge "Add Media Management Apps activity in Special App Access" into sc-dev am: 2d932aa5fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824387
Change-Id: I88bd6372ba7041aee932f2bd9aea71150d6ef2aa
2021-03-19 01:47:24 +00:00
TreeHugger Robot
2d932aa5fb
Merge "Add Media Management Apps activity in Special App Access" into sc-dev
2021-03-19 01:00:40 +00:00
Yu-Han Yang
7edaa43e77
Remove tests for Location Services summary am: 2a1f61829e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13920805
Change-Id: I8bb62abe09494a0297bffc2df54478e097b2975e
2021-03-18 21:56:58 +00:00
Yu-Han Yang
2a1f61829e
Remove tests for Location Services summary
...
Bug: 183068632
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.LocationServicesPreferenceControllerTest"
Change-Id: I9c310ba1c320c182030e5ba7c64099e1b65ea109
2021-03-18 11:12:57 -07:00
Dmitri Plotnikov
ff17d4c828
Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev am: e4fc48f33e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879791
Change-Id: I71e484cbf52e35639857da6a86f4387a98297e08
2021-03-18 15:47:51 +00:00
Dmitri Plotnikov
e4fc48f33e
Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev
2021-03-18 15:33:47 +00:00
Chiachang Wang
5d1d5b3df7
Merge "Update mocking to correct target methods" am: efa884758b
am: b64bf233a3
am: 7dce573e9d
am: 04f43b188d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306
Change-Id: I9c33e18c8f4ee238b03dbc2bc16ebbe10e95f7e4
2021-03-18 15:28:52 +00:00
Chiachang Wang
04f43b188d
Merge "Update mocking to correct target methods" am: efa884758b
am: b64bf233a3
am: 7dce573e9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306
Change-Id: I99179fe4a754849f50f6b06ce9b7424a88478184
2021-03-18 15:14:07 +00:00
Chiachang Wang
7dce573e9d
Merge "Update mocking to correct target methods" am: efa884758b
am: b64bf233a3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306
Change-Id: I8fed607cd748348e714470f5fe8159abe445313d
2021-03-18 14:29:12 +00:00
Almaz Mingaleev
06b2ac824d
Merge "Fix imports in LocationTimeZoneDetectionPreferenceController." into sc-dev am: 39396b0bb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13840827
Change-Id: Ia8b93eb27be44904b1224a74f2948338677ec0e4
2021-03-18 09:35:33 +00:00
Almaz Mingaleev
39396b0bb2
Merge "Fix imports in LocationTimeZoneDetectionPreferenceController." into sc-dev
2021-03-18 09:23:30 +00:00
TreeHugger Robot
900fc6d178
Merge "Smart Router settings UI changes" into sc-dev am: cb64ea60c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13877245
Change-Id: Ie23173ea18d3e9ed05d9067157640f937378f9fc
2021-03-18 07:17:39 +00:00
Chiachang Wang
6290ad9509
Update mocking to correct target methods
...
The correct target context should use the mActivity in
MobileNetworkSettingsTest, so that the mocking for
telephony service could correctly applied.
Both AutoTimeZonePreferenceControllerTest and
BasebandVersionPreferenceControllerTest refer to the lib
implemented shadow Connectivitymanager but that does not
the correct reference after utils class being updated.
Update the test logic inside to refer to correct method.
The reference to ShadowConnectivityManager does not needed
anymore so remove it from the test.
Fix: 183068151
Fix: 183067742
Fix: 183068139
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.network.telephony.MobileNetworkSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.datetime.AutoTimeZonePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings\
.deviceinfo.firmwareversion.BasebandVersionPreferenceControllerTest
Change-Id: I15ecc6aab7d530d20cd23b06267cc184a2c62b40
2021-03-18 14:53:07 +08:00
TreeHugger Robot
cb64ea60c2
Merge "Smart Router settings UI changes" into sc-dev
2021-03-18 06:43:16 +00:00
Dmitri Plotnikov
313dbc0355
Remove references to BatteryStatsHelper from PowerUsageBase
...
Bug: 180630447
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ifed69c4fdd741f75b0b962f9d3200f0ed533358f
2021-03-18 06:07:29 +00:00
Kunhung Li
b92dced47f
Clear WallpaperPicker task before launch am: 5f2cf8e695
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13869868
Change-Id: I1aa28544148d1bfa2a1a249d6a919af9959a998d
2021-03-18 06:02:49 +00:00
Kunhung Li
5f2cf8e695
Clear WallpaperPicker task before launch
...
There are different launch sources to start WallpaperPicker, clear
previous task to prevent keeping old activity.
Bug: 177638480
Test: make RunSettingsRoboTests
Change-Id: Ia4d3d5c7e5df4a5d3acb137f644939c079d5028f
2021-03-18 05:37:14 +00:00
SongFerng Wang
04f42d146d
Merge "Moving the error messages from slice to panel's subtitle" into sc-dev am: 45726b937b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812558
Change-Id: I1b39d00f88fa1774a15f0b7ecd1b7e917da8641d
2021-03-18 05:10:21 +00:00
TreeHugger Robot
90bd5be192
Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev am: 46fdf4d5be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868211
Change-Id: Ieb16a593e3d32e99007101edb6e0270ce7b3a7d0
2021-03-18 05:10:15 +00:00
Yanting Yang
bf8d9d7490
Merge "Fix NPE of AppVersionPreferenceController" into sc-dev am: 8f414f2e0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13886027
Change-Id: I98435d5ac5e267d6eb8ad7e1757a2add2bbec742
2021-03-18 05:09:35 +00:00
SongFerng Wang
45726b937b
Merge "Moving the error messages from slice to panel's subtitle" into sc-dev
2021-03-18 04:58:50 +00:00
TreeHugger Robot
46fdf4d5be
Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev
2021-03-18 04:57:29 +00:00
Jason Hsu
b1f6c4658c
Merge changes from topic "accessibility_floating_menu_ui" into sc-dev
...
* changes:
Remove half circle option in size selector
Update the vector drawable for accessibility button preview preference
Remove the accessibility gesture tutorial dialog in system navigation
Update the dialog content for accessibility floating menu
Add the preference controller to control accessibility button fade preference
Add the preference controller to control accessibility button preview preference
Add the preference controller to control accessibility button opacity preference
Add the preference controller to control accessibility button size preference
Add the preference controller to control accessibility button location preference
Setup basic layout and resources for the accessibility button settings page
2021-03-18 04:54:54 +00:00
Yanting Yang
8f414f2e0f
Merge "Fix NPE of AppVersionPreferenceController" into sc-dev
2021-03-18 04:48:54 +00:00
Dmitri Plotnikov
0e853e53d3
Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev am: b72d0ee651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863822
Change-Id: I26af5e38484e379b589c1dfe14a8d3ee16dc745c
2021-03-18 04:02:19 +00:00
Treehugger Robot
e5dfff612b
Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a
am: 207fa629bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940
Change-Id: I4fda2ca5e2415431af1d7178064e3f05e46d2715
2021-03-18 03:41:57 +00:00
Dmitri Plotnikov
8f6c946c82
Transition HighUsageDetector to BatteryUsageStats API
...
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ie8f90a67e4dd16fa67cf4f44a3678a789b3da18a
2021-03-18 03:32:43 +00:00
Dmitri Plotnikov
296dce404e
Remove references to BatteryStatsHelper from AppBatteryPreferenceController
...
Bug: 173745486
Bug: 180630447
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ic836d9f5e791d1e3ddc2237ff108190e53dcac19
2021-03-17 23:40:45 +00:00
Peter Wang
3091978e7a
Merge "Fix coding styles for erase euicc only options" into sc-dev am: 3f7d415e2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13894357
Change-Id: I72404bc62312ee671238323332b970fad54d1510
2021-03-17 22:20:04 +00:00
Peter Wang
3f7d415e2d
Merge "Fix coding styles for erase euicc only options" into sc-dev
2021-03-17 22:09:04 +00:00
Colin Cross
1871042664
Merge "resolve merge conflicts of d42d9a41f6
to sc-dev" into sc-dev am: 321f413343
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13904045
Change-Id: I019ec2f2f5ed6ec8d2be519d821ee7f139af4bb3
2021-03-17 22:02:02 +00:00
Colin Cross
321f413343
Merge "resolve merge conflicts of d42d9a41f6
to sc-dev" into sc-dev
2021-03-17 21:43:07 +00:00
Dmitri Plotnikov
87c1d43500
Transition BatteryAppListPreferences to BatteryUsageStats API am: 036dc189b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863806
Change-Id: I0507d54255368b6c9ea4fa05b7da2b9322deb326
2021-03-17 21:37:06 +00:00
Dmitri Plotnikov
b108acaad0
Merge "Remove smearing of hidden BatterySipper power" into sc-dev am: dba51aa233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13855858
Change-Id: I7c1c8c6a8ceb7fb39534f2b3f65582492df99908
2021-03-17 21:32:58 +00:00
TreeHugger Robot
3375e5b8bf
Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev am: 60cc9e507b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13821292
Change-Id: I026fe95e25df6f8f257118ca7f6a89838fae8345
2021-03-17 21:14:17 +00:00
Dmitri Plotnikov
036dc189b6
Transition BatteryAppListPreferences to BatteryUsageStats API
...
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: I7af8cbcd27433b89cb2184750c6854aa74761d0d
2021-03-17 13:23:25 -07:00
Janis Danisevskis
5cef487b4b
resolve merge conflicts of d42d9a41f6
to sc-dev
...
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
Dmitri Plotnikov
f941a684e1
Remove smearing of hidden BatterySipper power
...
Bug: 182598424
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.appinfo.AppBatteryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest
Change-Id: I78b8d7c4faafa83de198005617e99a7f54bcd174
2021-03-17 17:01:39 +00:00
TreeHugger Robot
60cc9e507b
Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev
2021-03-17 16:57:42 +00:00
Chiachang Wang
03c2ccba3e
Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev am: 6f41bb5722
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892870
Change-Id: I3162e0f749d8cd30e924ccbf843d17b23ee718cf
2021-03-17 15:31:31 +00:00
Chiachang Wang
d507dc19b1
Replace hidden CM#isNetworkSupported() usage
...
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.
Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
Merged-In: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:22:40 +00:00
Chiachang Wang
6f41bb5722
Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev
2021-03-17 15:21:17 +00:00
jasonwshsu
9a5925c471
Remove half circle option in size selector
...
Half circle accessibility floating menu mode changed to be triggered from gesture.
cherry picked from commit c2057ae257
Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: I123baaf3684d5cbb0a33fc2383da72aa022876c0
Merged-In: I123baaf3684d5cbb0a33fc2383da72aa022876c0
2021-03-17 23:05:37 +08:00
jasonwshsu
648811b2b4
Add the preference controller to control accessibility button fade preference
...
* Opacity preference will be disabled when fade is disabled
cherry picked from commit f9fdedaafe
Bug: 173940869
Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest
Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
Merged-In: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
2021-03-17 23:01:36 +08:00
jasonwshsu
eb2411db9d
Add the preference controller to control accessibility button preview preference
...
* Create FloatingMenuLayerDrawable class to handle the preview layer drawable
cherry picked from commit 603014760f
Bug: 173940869
Test: atest AccessibilityButtonPreviewPreferenceControllerTest FloatingMenuLayerDrawableTest
Change-Id: Ia3d030547b377e87c505b2310f559f7f3876ecd5
Merged-In: Ia3d030547b377e87c505b2310f559f7f3876ecd5
2021-03-17 23:00:39 +08:00
jasonwshsu
c72fe39597
Add the preference controller to control accessibility button opacity preference
...
cherry picked from commit c497c7aabe
Bug: 173940869
Test: atest FloatingMenuOpacityPreferenceControllerTest
Change-Id: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
Merged-In: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
2021-03-17 22:59:03 +08:00
jasonwshsu
0377025554
Add the preference controller to control accessibility button size preference
...
cherry picked from commit 04955b96ae
Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: Ic206a940abde90641442df37a634c8cb3a345597
Merged-In: Ic206a940abde90641442df37a634c8cb3a345597
2021-03-17 22:57:50 +08:00
jasonwshsu
2dc32f63f8
Add the preference controller to control accessibility button location preference
...
cherry picked from commit 123464429d
Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
Merged-In: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
2021-03-17 22:57:05 +08:00
jasonwshsu
03dbb40d2b
Setup basic layout and resources for the accessibility button settings page
...
cherry picked from commit 93ef33655c
Bug: 173940869
Test: atest AccessibilityButtonFragmentTest
Change-Id: I3f1d8b161d1baadeead36f49f18f00a91fd40b4c
Merged-In: I3f1d8b161d1baadeead36f49f18f00a91fd40b4c
2021-03-17 22:55:47 +08:00
SongFerngWang
0c86903ec6
Moving the error messages from slice to panel's subtitle
...
Bug: 180888831
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j
Change-Id: I4572c8ad15effab0c95feaeac6a99f5aaabf6f90
2021-03-17 22:49:31 +08:00