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

80564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
e70ffbaccb [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: fa2fe0c755 -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: Ic05a121a02cba5bc9473ad1c93d743bfa5d673d3
 2021-03-19 06:22:39 +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
37e061b705 [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: d9563efe07 -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: Iea44c8cfc5998b75843a2ac58a1f36bf88ace356
 2021-03-19 06:05:34 +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
Dmitri Plotnikov
c00314f85f Merge "Remove unused code" into sc-dev am: a7f7d79431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13921174

Change-Id: I524765deb1e39e4a03fbc6ceb803db98c2189afa
 2021-03-19 05:46:53 +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
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
3d5f57b6e2 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: Id9c116ec079d7f87ce23c3ec2ee85f9d836a3104
 2021-03-19 04:02:56 +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
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
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
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
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
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
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
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