Yanting Yang
e8af88794f
Merge "Adjust preference order to correct the position of Accounts" into sc-dev am: 69e911b66b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916858
Change-Id: I5ef662176a59d0b25ac27cd91295f91a632f2b2f
2021-03-19 03:26:33 +00:00
Yanting Yang
69e911b66b
Merge "Adjust preference order to correct the position of Accounts" into sc-dev
2021-03-19 03:02:14 +00:00
SongFerng Wang
155445d472
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev am: 993b820a76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824401
Change-Id: I392c2009454cebafbc1d9082e597b1402eb27a37
2021-03-19 01:49:29 +00:00
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
SongFerng Wang
993b820a76
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev
2021-03-19 01:28:31 +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
Sally Yuen
f770eb2cad
Merge "Update RBC UI with latest strings" into sc-dev am: 952f98941f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13888786
Change-Id: Ida46ee8f659bbd9d09d4561323be968dffe1f66d
2021-03-18 17:23:48 +00:00
Shireesha Bongarala
d4fc208f0d
Merge "Add strings for Safety & Emergency section"
2021-03-18 16:38:26 +00:00
Sally Yuen
952f98941f
Merge "Update RBC UI with latest strings" into sc-dev
2021-03-18 16:10:39 +00: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
Yanting Yang
187c9a344f
Adjust preference order to correct the position of Accounts
...
Bug: 183070484
Test: visual
Change-Id: I551b326067966ed3c8db74c264596ec09b8bd8db
2021-03-18 23:37:18 +08: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
TreeHugger Robot
f4fb5e47bb
Merge "Refinements for DND settings" into sc-dev am: 11ea8316e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13902435
Change-Id: I4679ff93095d8337eb8c1b646f3781c1a6845b91
2021-03-18 15:06:35 +00:00
TreeHugger Robot
11ea8316e0
Merge "Refinements for DND settings" into sc-dev
2021-03-18 14:35:19 +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
Chiachang Wang
b64bf233a3
Merge "Update mocking to correct target methods" am: efa884758b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306
Change-Id: I2d68748adf0154af2a3b9017d4510041af5baf12
2021-03-18 13:53:11 +00:00
Chiachang Wang
efa884758b
Merge "Update mocking to correct target methods"
2021-03-18 13:16:14 +00:00
Yanting Yang
d79eda11c4
Merge "Remove Advanced category from Network & internet" into sc-dev am: 48cc107acd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916845
Change-Id: Icff913190f02348887cf5204c10fc11ad4b8f57b
2021-03-18 11:38:46 +00:00
Yanting Yang
48cc107acd
Merge "Remove Advanced category from Network & internet" into sc-dev
2021-03-18 10:59:26 +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
Yanting Yang
c3e886142c
Merge "Remove grouping from homepage" into sc-dev am: fadf32ffcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13911068
Change-Id: Ifd46c3e8bf16cb56419c28fdf0c26403fac04d3b
2021-03-18 09:34:49 +00:00
Almaz Mingaleev
39396b0bb2
Merge "Fix imports in LocationTimeZoneDetectionPreferenceController." into sc-dev
2021-03-18 09:23:30 +00:00
Yanting Yang
0e05b2e8ac
Remove Advanced category from Network & internet
...
Based on the latest UX design to remove the Advanced category.
Fixes: 182742887
Bug: 182237530
Test: robotests & visual
Change-Id: Idc184960c3ac74610545c036d5a22959ac6730c1
2021-03-18 17:15:23 +08:00
Yanting Yang
fadf32ffcb
Merge "Remove grouping from homepage" into sc-dev
2021-03-18 08:57:37 +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
Yanting Yang
395f26a66e
Remove grouping from homepage
...
Based on the latest UX design to remove the grouping from homepage.
Fixes: 183070484
Test: visual
Change-Id: I5834366f37e9198e8830ee67980eabc016d56909
2021-03-18 14:22:28 +08: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
Jason Hsu
ba2c4f5bf0
[automerger skipped] Merge changes from topic "accessibility_floating_menu_ui" into sc-dev am: b1f6c4658c
-s ours
...
am skip reason: skip tag Change-Id I123baaf3684d5cbb0a33fc2383da72aa022876c0 with SHA-1 c2057ae257
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899515
Change-Id: I086cab70a2b8de72332d03197a446ee63369e8ec
2021-03-18 05:09:52 +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
Treehugger Robot
5250026c04
[automerger skipped] Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a
am: 207fa629bc
am: e5dfff612b
-s ours am: 6da9386097
-s ours
...
am skip reason: skip tag Change-Id I8f1d11558b1be575a0777ed195abe027e838cb74 with SHA-1 ffbe4e9b1e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940
Change-Id: Iff259a56f19ca75214e2c962de59180d811d861c
2021-03-18 05:09:17 +00:00
Chiachang Wang
46dfbb55a6
Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05
am: 3ad73342c7
am: 168298f426
am: 75014e693d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827
Change-Id: I7ec0105478a0e73ba8c9e87c4962b872297c5995
2021-03-18 05:06:43 +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
Treehugger Robot
6da9386097
[automerger skipped] Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a
am: 207fa629bc
am: e5dfff612b
-s ours
...
am skip reason: skip tag Change-Id I8f1d11558b1be575a0777ed195abe027e838cb74 with SHA-1 ffbe4e9b1e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940
Change-Id: I6de4ffcf98cc084a55e774aca898240dc48af7bc
2021-03-18 04:35:41 +00:00
Chiachang Wang
75014e693d
Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05
am: 3ad73342c7
am: 168298f426
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827
Change-Id: Ie8f4aad4c3d89e5b06800d61719478d6b4b7afdd
2021-03-18 04:34:00 +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
544617a706
Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev am: 735281a739
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13902431
Change-Id: I0c52ff4243fe576dfb7d7d6651e2579fd0603880
2021-03-18 04:01:33 +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