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
Weng Su
f4432df069
[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"
...
This reverts commit 32d5d3a3a3
.
Bug: 174047492
Reason for revert:
Look like the WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS system flag is not supported in the pi-dev branch.
Change-Id: Iec3c28e8c148f83fc171d696b2fc67f359d03eb8
2021-03-18 09:02:20 +00:00
Yanting Yang
fadf32ffcb
Merge "Remove grouping from homepage" into sc-dev
2021-03-18 08:57:37 +00:00
Bill Lin
dd2654493f
2/ Set Swipe bottom for notification OFF by default
...
Note:
1) The "Swipe bottom for notification" will still available
in Settings
2) If user had ever turn ON this settings, then we will NOT help
user change() any setting for this purpose.
Test: facory reset and observe the default function if OFF
Bug: 182711813
Change-Id: I9d76c6c5c83a1dcfaaf289b5af9dcc996bb943fa
2021-03-18 15:47:21 +08: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
Chiachang Wang
168298f426
Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05
am: 3ad73342c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827
Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
2021-03-18 03:41:16 +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
b72d0ee651
Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev
2021-03-18 03:32:28 +00:00
TreeHugger Robot
735281a739
Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev
2021-03-18 03:28:19 +00:00
Treehugger Robot
207fa629bc
Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940
Change-Id: I7aa0702f04c1f876851661ea54ba289b5eb9234d
2021-03-18 03:25:20 +00:00
Chiachang Wang
3ad73342c7
Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827
Change-Id: If019c9b540f58e82b250693ed05dfabcda2c7c66
2021-03-18 03:19:28 +00:00
Treehugger Robot
959325e88a
Merge "Replace hidden CM#isNetworkSupported() usage"
2021-03-18 02:39:21 +00:00
Chiachang Wang
2f66e59e05
Merge "Replace the hidden ProxyInfo methods usage"
2021-03-18 02:37:00 +00:00
Chiachang Wang
ce97d11d5f
Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664
am: cda53ebeae
am: f60f9ec14c
am: 77dc754137
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821
Change-Id: Iff4054c1e77b1bc229b4010f625db0e214521a4b
2021-03-18 02:17:57 +00:00
Chiachang Wang
77dc754137
Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664
am: cda53ebeae
am: f60f9ec14c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821
Change-Id: I904f5ec889d40113bf232f7935a98c6da030c9c3
2021-03-18 01:43:58 +00:00
Chiachang Wang
f60f9ec14c
Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664
am: cda53ebeae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821
Change-Id: Ie3a809e901745d7143d0b2b48023f2ddd3671480
2021-03-18 01:18:45 +00:00
Chiachang Wang
cda53ebeae
Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821
Change-Id: I6794a8d8113b5167b24e875554bc54b9155dd97f
2021-03-18 00:42:40 +00:00
Haining Chen
fc2aea2a17
Update settings tests with biometric component info
...
Bug: 156024031
Test: m -j
Change-Id: I94c00d2fb8bc209123ed9889b906a82cc40978b8
2021-03-17 17:27:38 -07:00
Chiachang Wang
dd61e5d664
Merge "Replace the way to access StaticIpConfiguration"
2021-03-18 00:23:14 +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
Lucas Lin
c5844949ad
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d
am: ddbd32432e
am: 5c73826020
-s ours am: a565961bf0
-s ours
...
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: I416f3e7af6a09e5e6b5b80cdbd6749ce04fc2f5a
2021-03-17 22:25:51 +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
Lucas Lin
a565961bf0
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d
am: ddbd32432e
am: 5c73826020
-s ours
...
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: Ia2b0bf14f32d65ad0f5e44100b9dcc3402b21a3b
2021-03-17 22:13:33 +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
TreeHugger Robot
d53fa89b32
Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6
am: 2bec77689e
am: 09861022ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828
Change-Id: I5ec713bef2af649b387aa199f2f1de7b94f8b31e
2021-03-17 22:05:45 +00:00
TreeHugger Robot
09861022ab
Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6
am: 2bec77689e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828
Change-Id: I82b251563ecf1b12ae4b733bcc2aa8a1dffd2d19
2021-03-17 22:04:40 +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