Commit Graph

80647 Commits

Author SHA1 Message Date
Yanting Yang
32faee27f4 Change order of Security and Privacy on Homepage
Fixes: 180093517
Test: visual
Change-Id: I853b36ce5d6f2e9e365524df4860fb9e522c9321
2021-03-19 12:14:05 +08:00
Haining Chen
9da33c3404 Merge "Update settings tests with biometric component info" into sc-dev am: 0981e4d65b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797278

Change-Id: I9ad6904ae7133d68e7ee295ccb75f02ef4386ea9
2021-03-19 04:03:14 +00:00
Weng Su
1a4cf947f5 [automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1f6 -s ours am: 1e8d908cfc -s ours
am skip reason: skip tag Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is already in history. Skip tag was found from reverted change Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13910509

Change-Id: I7f8489b6c9d256a98b5d4f0dbb30231a1c542cc0
2021-03-19 04:02:57 +00:00
Haining Chen
0981e4d65b Merge "Update settings tests with biometric component info" into sc-dev 2021-03-19 03:49:10 +00:00
Weng Su
1e8d908cfc [automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1f6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13910509

Change-Id: I0673d0d8115819b39f0d9c3270dc2e98be11c2de
2021-03-19 03:29:28 +00:00
Yanting Yang
a985b4af29 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: Ib3d363a69a44a0bb067f312e06a1a284c4b8ce4a
2021-03-19 03:25:23 +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
Weng Su
56dc96d1f6 Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev 2021-03-19 02:51:52 +00:00
SongFerng Wang
99c34c1740 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: Ie137c72afb38fc17ce9df6ff9f748df0bb05a94e
2021-03-19 01:47:59 +00:00
TreeHugger Robot
44fe23216e 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: I9e9c54489623bf10123c567fd5132ed947408907
2021-03-19 01:46:32 +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
89c6cf2e6e Remove tests for Location Services summary am: 2a1f61829e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13920805

Change-Id: I60ac218b3329ac9f257d6284f4957f4f69bd2201
2021-03-18 22:05:57 +00:00
Dmitri Plotnikov
3bd707ab1a Remove unused code
Bug: 173745486
Test: make RunSettingsRoboTests
Change-Id: I9e6e32e4ad594b7d6f5f984bf1b839caf654066b
2021-03-18 12:59:15 -07: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
82419bb08f 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: I5cc5bd31009185981b4b175bb3fc153550b2a914
2021-03-18 17:23:46 +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
4af6b4d0c4 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: I2fd139c33eeecb4c8fb4e57516e10e2e094f6060
2021-03-18 15:48:26 +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
e7866743d3 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: I80c2110f0eba77f6a62e85a791855b46adc46080
2021-03-18 15:29:36 +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
2c25257173 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: I3cf56466a4a0752cd2dad7ea7726cf550889ff30
2021-03-18 15:09:37 +00:00
TreeHugger Robot
11ea8316e0 Merge "Refinements for DND settings" into sc-dev 2021-03-18 14:35:19 +00:00
Chiachang Wang
003e27d146 Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
2021-03-18 14:31:28 +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
eedfa1d307 Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
Merged-In: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
2021-03-18 22:25:05 +08: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
e7eaa7c701 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: I59880d760b723f28ecdb4557f6faa5d8f9c6621c
2021-03-18 11:38:55 +00:00
Chiachang Wang
11c37350d9 Replace the way to get the network for no internet dialog
It's a refactor work for incoming connectivity mainline. The
network information contained in the no ineternet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Update the corresponding logic in Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiNoInternetDialogTest
Change-Id: I75c04d6f1c2159ae990f6015551eb39d99266336
2021-03-18 11:35:05 +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
548f264bd3 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: Iaaeaab0a2d39bfaf9760ee475ad1942339566dcd
2021-03-18 09:35:34 +00:00
Weng Su
b7dbd3a911 Hide edit menu if network is uneditable
- Screenshot:
  https://screenshot.googleplex.com/3BhZRBrmQXjeaGL

Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
2021-03-18 17:35:25 +08:00
Yanting Yang
d6174afbb6 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: Ied21e522a293756afe93927c9d0afbf5bc1a7d60
2021-03-18 09:35:06 +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
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
6699634163 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: I69b24eeccbd78ea00efd42f210a6e09febdc4604
2021-03-18 07:18:08 +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
ab85ca9570 Clear WallpaperPicker task before launch am: 5f2cf8e695
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13869868

Change-Id: Icc768c66b843c8dbab9faedbce0e396c7bb23b80
2021-03-18 06:03:32 +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
8d4651b255 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: I43c2470bec18024fd0942c4b7ea34879f7ecf1fd
2021-03-18 05:16:23 +00:00
TreeHugger Robot
c0f6a91c34 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: I9dd4e927b465c4d257d356e399fc0f74eb930c58
2021-03-18 05:16:03 +00:00
Jason Hsu
49a69dfce7 Merge changes from topic "accessibility_floating_menu_ui" into sc-dev am: b1f6c4658c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13899515

Change-Id: I9328a6aa97881dfe97d842d170f58a62d0b3b991
2021-03-18 05:15:43 +00:00