PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,062 Commits 1 Branch 0 Tags
ebcb3308eeb8980f19cd7cda84d35abdef647def
Commit Graph

80062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ebcb3308ee Merge "Fix jank in app pinning page" into sc-dev 2021-03-19 09:27:46 +00:00
Yanting Yang
5fd10eed56 Merge "Change order of Security and Privacy on Homepage" into sc-dev 2021-03-19 08:37:41 +00:00
Tsung-Mao Fang
0d27676bba Fix jank in app pinning page 
In the original design, we will hide the
"lock device when unpinning" while master toogle is disabled.

To prevent the jank issue, we only disabled this setting now.

Test: Rebuilt rom and check the ui
Fix: 182958597
Change-Id: I96e3488f7326c310d3e1e7f22e63a4c77db8dafd
 2021-03-19 16:18:29 +08:00
Jeremy Goldman
37a7786c2b Merge "Add goldmanj to the Settings' vpn2 directory Owners file" am: 19c5d0a749 am: 218ca3cbe9 am: 8e8d13fd83 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1634463

Change-Id: I2ddb110127fd12877e2eb1fa807a8ddffc76c839
 2021-03-19 07:47:38 +00:00
Jeremy Goldman
8e8d13fd83 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" am: 19c5d0a749 am: 218ca3cbe9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1634463

Change-Id: Ida896c587d2d02de4ccdee7faf41f25d15f9f232
 2021-03-19 07:23:09 +00:00
Chiachang Wang
f517a120d0 Merge "Remove hidden connectivity methods access" into sc-dev 2021-03-19 07:20:07 +00:00
Jeremy Goldman
218ca3cbe9 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" am: 19c5d0a749 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1634463

Change-Id: I22f165eba9482a6493e4e2bf7ce487208e6c0cf5
 2021-03-19 06:43:58 +00:00
Jeremy Goldman
19c5d0a749 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" 2021-03-19 06:15:40 +00:00
Weng Su
fa2fe0c755 [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: 1a4cf947f5 -s ours am: 097d262fda -s ours am: faa183cb7b -s ours am: 7772bf587f -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: I25c1a058662bea6401d61134dc03e7f642326309
 2021-03-19 06:10:16 +00:00
Weng Su
d9563efe07 [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: 1a4cf947f5 -s ours am: 097d262fda -s ours am: 754285bec8 -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: Ia269f5d5b95cb53979ee90ea9ac478c2c47c3f3b
 2021-03-19 05:50:38 +00:00
Weng Su
7772bf587f [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: 1a4cf947f5 -s ours am: 097d262fda -s ours am: faa183cb7b -s ours 
am skip reason: skip tag Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 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: I8f6d70e727e3ec61f6fcd7fdd8059bf3718395cd
 2021-03-19 05:46:36 +00:00
Dmitri Plotnikov
a7f7d79431 Merge "Remove unused code" into sc-dev 2021-03-19 05:10:48 +00:00
Weng Su
754285bec8 [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: 1a4cf947f5 -s ours am: 097d262fda -s ours 
am skip reason: skip tag Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 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: I86b3367f08ff5896cd56fe13a77384a723cc2ec5
 2021-03-19 05:06:22 +00:00
Weng Su
faa183cb7b [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: 1a4cf947f5 -s ours am: 097d262fda -s ours 
am skip reason: skip tag Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 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: Ie109931c17fd62c42a4fb88c32866f42347e6c48
 2021-03-19 05:01:43 +00:00
Weng Su
097d262fda [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: 1a4cf947f5 -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: Icd1b51ce7924bd3362fe3a1bd37b9ea1043bc03b
 2021-03-19 04:23:28 +00:00
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
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
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
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
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
952f98941f Merge "Update RBC UI with latest strings" into sc-dev 2021-03-18 16:10:39 +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
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
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
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
48cc107acd Merge "Remove Advanced category from Network & internet" into sc-dev 2021-03-18 10:59:26 +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
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
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
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