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

80049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
dc3888a9c5 Merge "Add a missing string for new Intent Picker" into sc-dev am: f2bbadf57b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13794934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b708b995256fdcc50be69a6679756621155e60b
 2021-03-08 06:27:39 +00:00
Weng Su
d3e90e92d4 Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev am: 5c82ddf075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2179d2900be82ad280b0b881569d555a44564dd
 2021-03-08 06:27:22 +00:00
TreeHugger Robot
f2bbadf57b Merge "Add a missing string for new Intent Picker" into sc-dev 2021-03-08 06:07:59 +00:00
Weng Su
5c82ddf075 Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev 2021-03-08 05:57:06 +00:00
Sunny Shao
1799258ecb Add a missing string for new Intent Picker 
- Add the "Opens in" that was missed in last Intent Picker submit.

bug: 177923646
Test: compilation
Change-Id: I40a2bdbf282dd5c9cc325e80772d355192ef9002
 2021-03-08 02:46:25 +00:00
Yomna Nasser
90e7e5f728 Merge "Add metrics to Enable2gPreferenceController." into sc-dev am: b6042cec85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13743650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb6c15f97700fd490f42f011b99e387722187782
 2021-03-07 04:14:15 +00:00
Weng Su
db37f2e48e [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours am: 354bdce86b -s ours am: 41c1e71b0b -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 32d5d3a3a3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie21a66a79e67bbcc9ea2b1ca56d8944101d6fd08
 2021-03-07 04:08:31 +00:00
Weng Su
d2c2c9927a [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 422280c10d -s ours am: 01961e9e11 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc9804aa492679117924465cdc69dc605edc2c34
 2021-03-07 04:08:22 +00:00
Ahaan Ugale
43344a918a Merge "AF: Show passwords settings for available autofill service." into sc-dev am: 1d1f3ea85f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13723064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb4fbf73b3057fb59172c28977235578cb0864d5
 2021-03-07 04:00:47 +00:00
Yomna Nasser
b6042cec85 Merge "Add metrics to Enable2gPreferenceController." into sc-dev 2021-03-05 22:26:49 +00:00
Weng Su
41c1e71b0b [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours am: 354bdce86b -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 32d5d3a3a3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69d2291b6267b149d31c3cf18257d774ce2fff3a
 2021-03-05 21:37:42 +00:00
Weng Su
01961e9e11 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 422280c10d -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba00bfb17a2256c08a88356337dccfa58e4f651
 2021-03-05 20:58:49 +00:00
Weng Su
354bdce86b [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib60fc2fd5e2e16815f0aa60e6b542867855f2996
 2021-03-05 20:54:51 +00:00
Weng Su
422280c10d [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idad0d4683f21d80027e0891b1d14c1dd6b71245f
 2021-03-05 20:19:15 +00:00
Ahaan Ugale
1d1f3ea85f Merge "AF: Show passwords settings for available autofill service." into sc-dev 2021-03-05 20:16:53 +00:00
Weng Su
1f234b3791 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic08627d137adc378004da05adf8945c9f7b38b0a
 2021-03-05 20:14:51 +00:00
TreeHugger Robot
b876f4f418 Merge "NLS settings polish" into sc-dev am: 78e8175479 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13787325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4b488a43131fc6c8b9ab8334519045007be73ac
 2021-03-05 19:57:28 +00:00
Weng Su
8aa56318f8 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7896b97e36005b6f3b28f448a2e2ede6d373259f
 2021-03-05 19:39:23 +00:00
TreeHugger Robot
78e8175479 Merge "NLS settings polish" into sc-dev 2021-03-05 19:11:47 +00:00
Weng Su
385b5cafd2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae7ce98bd42db5528d78be0e8a72b86a5de9ee9
 2021-03-05 18:44:22 +00:00
Weng Su
efb2543e93 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a
 2021-03-05 18:12:04 +00:00
Zoey Chen
290ee6aa36 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev am: d841a36c6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660509

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc74834fa439257a2ff1c6e82d5c15cc3b777793
 2021-03-05 15:04:33 +00:00
TreeHugger Robot
d9b063428e Merge "Update new consent screen for fingerprint" into sc-dev am: e2410263f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774726

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I391dd20f56d11af681a94e5758516f3a54652a09
 2021-03-05 15:04:01 +00:00
Zoey Chen
d841a36c6f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev 2021-03-05 14:43:52 +00:00
TreeHugger Robot
e2410263f2 Merge "Update new consent screen for fingerprint" into sc-dev 2021-03-05 14:29:45 +00:00
Julia Reynolds
8aaa9b1b24 NLS settings polish 
- Update strings
- Link to NLS page from notifications
- And fix an ordering issue on that page

Test: manual
Fixes: 181855978
Fixes: 181125178
Change-Id: I93d975763326d1e6d0cd02887abc515ad55329d0
 2021-03-05 14:27:51 +00:00
TreeHugger Robot
e1dcf60cfd Merge "wifi: add WPA3 Enterprise entry in "Add network"" into sc-dev am: 8c96038584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49319ff9b78c970e2059bf0dcf1f5a703c4c6180
 2021-03-05 14:08:49 +00:00
TreeHugger Robot
8c96038584 Merge "wifi: add WPA3 Enterprise entry in "Add network"" into sc-dev 2021-03-05 13:58:28 +00:00
Wesley Wang
892cf9808e Merge "Update Battery Settings main page (1/2)" into sc-dev am: 783f1b1b56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib43d0b03cf4f9618a45b154eea51d21c0de46227
 2021-03-05 11:55:47 +00:00
Wesley Wang
783f1b1b56 Merge "Update Battery Settings main page (1/2)" into sc-dev 2021-03-05 11:23:39 +00:00
TreeHugger Robot
96324ec3a3 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev am: 2aa8d2b437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec5873050d56edd21763a467766a80e844ba7dfe
 2021-03-05 10:15:32 +00:00
TreeHugger Robot
2aa8d2b437 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev 2021-03-05 09:53:05 +00:00
Weng Su
edebd02b0a [Provider Model] Add Wi-Fi toggle 
- Network & internet Settings
  - Remove “Show airplane mode networks"

- Internet Settings
  - Add “Wi-Fi” switch preference
    - Show “Find and connect to Wi-Fi networks” in summary

- Screenshot:
  https://screenshot.googleplex.com/AnoXf4qDe2jPirP

Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
         WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
 2021-03-05 16:32:06 +08:00
Mill Chen
c2be31a7d3 Update new consent screen for fingerprint 
- Move top description into subtitle for landscape mode
- Update the button text

Bug: 177591560
Test: robotest and visual verified
1) Settings -> Security -> Fingerprint
2) Rotate the device and check if the description is on the right side

Change-Id: Ie20597fce48f73aa83c5d637682db1860c384a7a
 2021-03-05 15:53:01 +08:00
Weng Su
28b36fcc84 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours am: 5fe3617755 -s ours am: 6887ea151a -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa8680f713dcee23c523c3a00f9d438f823d3bbc
 2021-03-05 07:23:14 +00:00
Weng Su
6887ea151a [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours am: 5fe3617755 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I915bbd72bc7737c9bd53fac1bca98f18fc61fe8a
 2021-03-05 07:08:25 +00:00
Jason Hsu
c022defb32 Merge changes I135e5218,I1efd9760,Ia3d03054,I1fbe3157,Ic206a940, ... 
* changes:
  Add seekBar properties 'tickMark' to LabeledSeekBarPreference
  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-05 06:40:06 +00:00
TreeHugger Robot
f5e05ae984 Merge "Add strings for new Intent Picker" into sc-dev am: 0a6a65d8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1f33b0b0e432bda8522126d5f2dd84b43228caf
 2021-03-05 06:37:22 +00:00
Weng Su
15a3a7f836 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 66be7c55a2 -s ours am: 3fb9083a66 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7abf66ac98b800f5d9ea6d7710caebe2e8310a5
 2021-03-05 06:37:16 +00:00
TreeHugger Robot
3141299fe1 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: f0c01c5368 -s ours am: 3f925449c7 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffedae3a9d19adba5fdb758bd1c9c42043606351
 2021-03-05 06:37:10 +00:00
Weng Su
139995d26f [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 am: 2a0cad3a2a -s ours am: e82b74e43c -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c1e3bdfcd8452e64571dff5ae662fb8a37ec36f
 2021-03-05 06:37:03 +00:00
Janis Danisevskis
fa38dc723c [automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75 am: bb5ebce8a0 -s ours am: e0a303f6b6 -s ours 
am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf84154 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I190e05d204b477e1b34f361406679bc042ec073e
 2021-03-05 06:36:21 +00:00
TreeHugger Robot
0a6a65d8d0 Merge "Add strings for new Intent Picker" into sc-dev 2021-03-05 06:31:27 +00:00
Weng Su
3fb9083a66 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 66be7c55a2 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad2b19c3cc801589f4e5067ad6383415219b0d3b
 2021-03-05 06:20:28 +00:00
TreeHugger Robot
3f925449c7 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: f0c01c5368 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0cd261a7dba74f3e079654358a048f3d062fbda
 2021-03-05 06:20:07 +00:00
Weng Su
e82b74e43c [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 am: 2a0cad3a2a -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772b4de954c55d1f9d8a18e4386b74477a6c8c7e
 2021-03-05 06:19:21 +00:00
Weng Su
5fe3617755 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd1840366161db05f9ca1c772ea2b2b866fb4efa
 2021-03-05 06:15:42 +00:00
Wesley.CW Wang
280e3639cd Update Battery Settings main page (1/2) 
- Rollback ag/13413813 to meet the design change
 - Regrouping the index
 Screenshots:
   https://screenshot.googleplex.com/85aPq9ArJMWjJV2.png
   https://screenshot.googleplex.com/8uiZ9KLKAHoJyrP.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: Ic3c16d985b7c5e98e6d1bbe4481c48eadd3e4078
 2021-03-05 06:03:42 +00:00
Janis Danisevskis
e0a303f6b6 [automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75 am: bb5ebce8a0 -s ours 
am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf84154 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide6d1137c16bc0772e15fcccf8fd35b5d4da806f
 2021-03-05 05:59:24 +00:00
Weng Su
66be7c55a2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic21478386815ca5cd2f7513faf586d42963506e3
 2021-03-05 05:59:16 +00:00