PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,534 Commits 1 Branch 0 Tags
a943c509630ff0bbca8b6d85c66ce6ad76e1437a
Commit Graph

105534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
d1573cd417 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I88d0995852b1864a6ce85d2b304bcc7084d444f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:28 +00:00
Chaohui Wang
815ee3779b Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 334335bc6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I87294478784f6518f58e57aaeba0eef5af5b0297
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:26:55 +00:00
TreeHugger Robot
bf37dfd08a Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 4837d34fab am: 39f80a0d8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ib31a916a7c1a01eafbdaaed2762951de124a4810
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:26:43 +00:00
Weng Su
71b9cc0e32 Check Wi-Fi permissions for QrCode scanner 
- Launched package require ACCESS_WIFI_STATE and ACCESS_FINE_LOCATION permissions to get results

Bug: 187176859
Test: manual test
make RunSettingsRoboTests \
    ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest

Change-Id: Ie80c4e5b3a5863749de518e4736873390478816e
 2022-04-26 07:10:57 +00:00
Chaohui Wang
61a35e7b85 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:52:31 +00:00
Automerger Merge Worker
0ecead8a61 Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp am: 3f5b45397a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: If75a0c60a58c3d3137928e190a43277758b6f16c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:37 +00:00
Chaohui Wang
334335bc6a Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: Iebd9f7099abee0275a61cdc0083b9ee339c931d5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:33 +00:00
Jason Chiu
faf332ab5f Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e am: ca7d463f4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I35d91a8d1ee0705d9aa9bf3d8c3468a5fa243b98
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:27 +00:00
Automerger Merge Worker
b4e433845b Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp am: d53e79d292 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I0209574f5a9ac7cf37a6c5ea7d9a14ffdbdc8a58
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:22 +00:00
Chaohui Wang
6dc65f1eb4 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: Iea7bef3ceebeb17a54314389a1314a378d383d5c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:16 +00:00
Automerger Merge Worker
c9bdc0bee5 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 7ba258ee83" into tm-qpr-dev-plus-aosp 2022-04-26 06:51:02 +00:00
TreeHugger Robot
237c468661 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 7ba258ee83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ic52cf9c89c93fa8374775864d1bcc705cacddedd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:00 +00:00
Jason Chiu
9e636663b8 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e am: 163ee46ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: Id9d5634786ea3ff7fcee2bd75dd365fb7136f84d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:50:59 +00:00
TreeHugger Robot
39f80a0d8f Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 4837d34fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I8961eecc3296bb6cd50cc79077320f60b35309e6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:50:50 +00:00
Chaohui Wang
1a39660de0 Merge "Update Personal / work selection UI." into tm-dev 2022-04-26 06:34:37 +00:00
Automerger Merge Worker
3f5b45397a Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp 2022-04-26 06:28:08 +00:00
Jason Chiu
370c61e339 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I3b5e38835df123445bf89e270a36b7dd4a759b1b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:06 +00:00
Jason Chiu
ca7d463f4d Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I524ebc3da76ccac4bbbdaa6c0601c11d8f324379
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:05 +00:00
Jason Chiu
163ee46ef0 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I8a1ca0ab86930c57f64fbb9d712ec4b449b530bf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:03 +00:00
Automerger Merge Worker
d53e79d292 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp 2022-04-26 06:28:02 +00:00
TreeHugger Robot
7ba258ee83 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ie95b750091bf22ac690c73ebb49d63c906e047c2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:59 +00:00
TreeHugger Robot
81f281b6dc Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I955609258cbd7ab4faeaa0748a13e55fff2e5a03
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:59 +00:00
TreeHugger Robot
4837d34fab Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I7f2a5fc92011f20591e51ce2e64ff4255d9d9c23
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:57 +00:00
Jason Chiu
704689ab04 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 50893331e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I0ded6982be5c1d1334eaf8157de629505a1ebcf8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:38 +00:00
TreeHugger Robot
68bb261092 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 4e3f5c9253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I13ec576dbf17d1907006d0214d0a80738b4a6489
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:30 +00:00
Jason Chiu
b174c6853e Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: Ia100a0ee19b88d603887cad11b1849d1a5b9d2cd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:12:57 +00:00
TreeHugger Robot
5f3059ff3e Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ice45d444bedfecaad34cce27fedd38528cd5ab91
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:12:49 +00:00
Jason Chiu
50893331e5 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I2d6f4e17cda08de25b4963e729048bc70ee48deb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:58 +00:00
TreeHugger Robot
4e3f5c9253 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I9d3a483b648c9a8f55943c18e5388541a3749abb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:51 +00:00
Jason Chiu
5fe986be58 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I227ce218c0b7096412012ec04c356fa60e908882
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:40 +00:00
TreeHugger Robot
734ada269b Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I5e3948fb746aa2eb485cc0a2113f9f06a4ed234f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:31 +00:00
Jason Chiu
81ee2037ed Merge "Renew the highlight state color" into tm-dev 2022-04-26 06:08:40 +00:00
TreeHugger Robot
5a083d2bfe Merge "Change the alignment of the foreground preferernce controller" into tm-dev 2022-04-26 05:44:37 +00:00
Hugh Chen
00a8568b1b Merge "Implement advanced vpn ui in vpn settings" 2022-04-26 05:33:27 +00:00
Abel Tesfaye
939e0e0d9d Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master 
Test: none

Bug: 230378938
Change-Id: Ia0e9e5bf25d005aa6b8ccaa07a1901779b88588c
 2022-04-25 23:16:45 +00:00
Eric Biggers
8c25415736 MainClear: remove obsolete check for multi-volume FDE 
It is never the case that '!isExternalStorageEmulated() &&
!isExternalStorageRemovable() && isExtStorageEncrypted()', so stop
checking for this.

It's easy to see that even just the last part, isExtStorageEncrypted(),
is never true, since it checks whether the property "vold.decrypt" is
non-empty.  That system property was only set on devices that used FDE
(Full Disk Encryption), and FDE support was removed in Android T.

Moreover, the full condition of '!emulated && !removable && FDE'
actually checked for devices that used multi-volume FDE, which
apparently was never actually used, and was removed 8 years ago by vold
commit 87999173dd79 (http://ag/423222).  This is consistent with the
fact that this code was added 11 years ago by commit 2a32192329
(http://ag/134210), when probably this feature was still planned.

Bug: 208476087
Change-Id: I4c2b5c9aed8812367a70d0dd1bbcc94008fec529
 2022-04-25 23:15:31 +00:00
Joshua Mccloskey
79463db83b Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: eb4fa99d5a am: b44da73e77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ie2f0a6cba4ad3f5b868ba41fb5fb81b75d032ee7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:31:44 +00:00
Joshua Mccloskey
8d094ff541 Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f am: 872c5b533c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ife81fcfe043fb74098f94e25d58c01117362ac6e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:31:29 +00:00
Joshua Mccloskey
b44da73e77 Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: eb4fa99d5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I950af7978c4af50afbcde4d59395780973762764
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:00:36 +00:00
Joshua Mccloskey
872c5b533c Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I67b2e8a129697483bd0f0a410284efb9a61fdb5f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:00:21 +00:00
Joshua Mccloskey
eb4fa99d5a Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I6d5b095918d499447fa67f2e0ac2b28345885e32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:37:30 +00:00
Joshua Mccloskey
0a41ad016f Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ia50eaa82757cb61f1851bfa7c5e352646076162f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:37:13 +00:00
Joshua Mccloskey
e7c507070d Merge "Modified Fp -> Face setup flow" into tm-d1-dev 2022-04-25 21:14:39 +00:00
TreeHugger Robot
d6dc5cd830 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 am: 3f5a3ce250 am: c0d3713453 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I0b80d5524811e93a51cdd679aa217010996e697d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 20:00:15 +00:00
TreeHugger Robot
e621e63f1f Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: 7e8278e3cc am: de8bff5446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I55bdc367369d4e7cbde82219e0d4771a040295ba
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:58:23 +00:00
TreeHugger Robot
5a05d9d198 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015 am: 394c83c085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I100a7a613f1e46817a3b96a02948d711482dd2fd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:56:59 +00:00
TreeHugger Robot
c0d3713453 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 am: 3f5a3ce250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I9a037d94d134ee9d61bfd71f8e65cac02ff00f0c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:16:00 +00:00
TreeHugger Robot
de8bff5446 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: 7e8278e3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I6d00f1859f76d2715771c9b49d9d1b66fe736774
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:15:47 +00:00
TreeHugger Robot
394c83c085 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I94e6a462619de1b26c9e1fe8d357913139782823
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:15:37 +00:00
TreeHugger Robot
3f5a3ce250 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Ic0825c41a3879402d05a27bdffa48678143361aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:59:07 +00:00