PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,043 Commits 1 Branch 0 Tags
ef679ba476fffc1d7812b88b05a565e2e252b45f
Commit Graph

122043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ef679ba476 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 419d424c0b -s ours am: c9ff8dcdc8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bbc6409b109a75573c54ea579cc56b648491f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:23:08 +00:00
Bill Yi
d95bf6cfb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4bf6f099aa -s ours am: ab4978ac8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I256f33bd4812e62778556671a1c1f21a5ac347ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:23:05 +00:00
Becca Hughes
fcf80c0603 [automerger skipped] Merge "Add settings intent dialog" into udc-dev am: cbbab3632c am: 7b1a81e0a6 -s ours 
am skip reason: Merged-In Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32 with SHA-1 9d74509888 is already in history

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

Change-Id: I2f55bb624e87ca47dac36f16275233389eb9b1a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:18:50 +00:00
TreeHugger Robot
c9ff8dcdc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 419d424c0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3d9109379920fc40d70599e9c2c5a8a0944dd39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:59:30 +00:00
Bill Yi
ab4978ac8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4bf6f099aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74d8f523e73ebbadef5b94284ebc0039ee6e9ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:57:57 +00:00
TreeHugger Robot
999499f082 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b7c595c4de -s ours am: 4c3acacbd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60027c7e67d19e70d806cda0b1185f779e511583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:53:41 +00:00
Bill Yi
7d579ccc43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b11c37e6f6 -s ours am: 7758e6fb7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f92c76e7c03a4e34d7cbb86f71543971edb8af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:52:14 +00:00
Jason Hsu
4f473677b2 Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev am: 0ef1b05630 am: ebfe97df5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809666

Change-Id: Id9a684e007476f33492a145878bf7483c1a474b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:47:18 +00:00
Etan Cohen
6e301d24c8 Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev am: a7e606e406 am: 933b105924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22156122

Change-Id: I83d9e30cd106871f6fc93389103ddf218fa172ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:47:00 +00:00
Zoey Chen
f5422283c5 Merge "[Settings] The receiver should be registered with all clients instead of the client which init the repository" into udc-dev am: 4940c2978a am: 719d849e8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22198542

Change-Id: I51c720e2d7305ded6c37c0ca14b1f4f3da627e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:46:50 +00:00
TreeHugger Robot
a3fbc2ff26 Merge "Fixes AOSP crash when WPP isn't installed." into udc-dev am: 010ef319c8 am: 621571b461 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22187500

Change-Id: I35bea76a8e4dba06903ebc8d1260e9e859968db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:46:39 +00:00
TreeHugger Robot
779812e492 [automerger skipped] Merge "Show package name if no label" into udc-dev am: 9848eb9053 am: 705ba0f77e -s ours 
am skip reason: Merged-In I78b47e8c55382ceef90329547231124db2ca27d9 with SHA-1 0b5eb7691b is already in history

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

Change-Id: Ic40814402a8deb8f1b084ebcf811ec835626d64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:46:29 +00:00
Jason Hsu
6d1940bd4b Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8 am: c78bd74413 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384

Change-Id: I0ac50dfaa3151185a2d1b91af75e2d161cb437c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:45:34 +00:00
Becca Hughes
7b1a81e0a6 Merge "Add settings intent dialog" into udc-dev am: cbbab3632c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22181848

Change-Id: Ic3a96a9930c11a5420c0a8109171283fb5bde14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:40:15 +00:00
TreeHugger Robot
4c3acacbd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b7c595c4de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9eccc7ca136a58cee15f339fe0a6eff6489d0354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:19:41 +00:00
Bill Yi
7758e6fb7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b11c37e6f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie45c1ccbd062a89d1d28d3a24fbeaa0020236247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:19:22 +00:00
Becca Hughes
cbbab3632c Merge "Add settings intent dialog" into udc-dev 2023-03-23 17:07:56 +00:00
YK Hung
be92dd1c63 Merge "Update battery settings page footer string" into udc-dev am: 72690c6844 am: 1db438deff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Ib86145330314f39724c2b9d2725f4dc1846ecf58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:00:11 +00:00
Jason Hsu
ebfe97df5e Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev am: 0ef1b05630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809666

Change-Id: Idf0816d94ebcbd5d611f8b0d28c5627d21cfd9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:44:02 +00:00
Etan Cohen
933b105924 Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev am: a7e606e406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22156122

Change-Id: I6ca20839cc97dbf787251873df3f7ef9630b8dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:43:19 +00:00
Zoey Chen
719d849e8e Merge "[Settings] The receiver should be registered with all clients instead of the client which init the repository" into udc-dev am: 4940c2978a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22198542

Change-Id: I7b3ca5955457d2f6f5c2b91bfe1357d8ca2e8805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:43:05 +00:00
TreeHugger Robot
621571b461 Merge "Fixes AOSP crash when WPP isn't installed." into udc-dev am: 010ef319c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22187500

Change-Id: I3af5044cd8488e1621450c2729a9dfb7049a4c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:42:55 +00:00
TreeHugger Robot
705ba0f77e Merge "Show package name if no label" into udc-dev am: 9848eb9053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163925

Change-Id: I850e3dab8560aad409dff27f27597ba4a4bd0930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:42:41 +00:00
Jason Hsu
c78bd74413 Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384

Change-Id: I29d4e6a649d2e70af17003bac9878f9a728f9114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:42:00 +00:00
YK Hung
1db438deff Merge "Update battery settings page footer string" into udc-dev am: 72690c6844 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Iadb81f33606f807c60085e67429bfc04871d14b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:20:31 +00:00
YK Hung
72690c6844 Merge "Update battery settings page footer string" into udc-dev 2023-03-23 15:55:03 +00:00
Wu Ahan
80f0348463 Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b am: 2034c0c395 am: da385a3a1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: I5a166a5fae307ead1a29c3a68b37ef0c17418529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 15:18:40 +00:00
Wu Ahan
da385a3a1e Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b am: 2034c0c395 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: Ieb89d930c15214f55312c53b16c70315dff351a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 14:58:03 +00:00
Treehugger Robot
f17bcf53d4 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38 am: 0bf3e6c9a4 am: f6100cdfa5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I9db5a06277a2244c55ce37945cb58e7b8876058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 12:13:08 +00:00
Alexander Milantev
7289091af5 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2 am: 0e59c79809 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Id9dcbb5146408641a74377b88c75192be00f937a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 12:11:46 +00:00
Treehugger Robot
f6100cdfa5 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38 am: 0bf3e6c9a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I322e4eb78cb294a62c0e53f3daf7dafc5a368e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 11:36:26 +00:00
Alexander Milantev
0e59c79809 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Iff5c7efa1738ec452ed9327ab3f738450a7c989d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 11:35:13 +00:00
Treehugger Robot
0bf3e6c9a4 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: Ib5248f616a93ecc8b734291e80fd2160288f2c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 10:53:54 +00:00
Alexander Milantev
cb227a79a2 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev 2023-03-23 10:44:28 +00:00
Treehugger Robot
ebfd790f38 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I2d16235171ced53fa97c8c0c826869267d6e25ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 10:15:59 +00:00
Treehugger Robot
7b4a3ada12 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: Idaedbac33bebafb96ee87fb4e396a88a41708e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 09:39:15 +00:00
Treehugger Robot
993f582fca Merge "Hide TTS search results if no TTS engine is available" 2023-03-23 09:02:49 +00:00
Wesley Wang
c81b12aabf Update battery settings page footer string 
screenshot: https://screenshot.googleplex.com/4LdASHFSS23Q5NK.png

Bug: 274871896
Fix: 274871896
Test: make SettingsRoboTests
Change-Id: Ia739e5b004755a16fb80d460657bcffcb40404f9
 2023-03-23 17:01:42 +08:00
Josh Hou
aa9320159e [automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours am: b3ed786e76 -s ours am: 1d72f6d119 -s ours 
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history

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

Change-Id: Ib1845ea8ce3ff358ee62128be1d578a4713f4a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 07:46:56 +00:00
Tom Hsu
032da2c388 Merge "Remove Numbering System preference if no corresponding locale." into udc-dev am: db94f350cb am: 5d8121966d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122897

Change-Id: I8ac6395046d1f5b1613f751498a09267446cacbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 07:44:47 +00:00
Josh Hou
1d72f6d119 [automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours am: b3ed786e76 -s ours 
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history

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

Change-Id: I136dd196b891963dc009925430dfb48a63455238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 07:10:48 +00:00
Tom Hsu
5d8121966d Merge "Remove Numbering System preference if no corresponding locale." into udc-dev am: db94f350cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122897

Change-Id: I143b9528f46e78192a3135e5cab2c69b7522874e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 07:10:05 +00:00
Josh Hou
b3ed786e76 [automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours 
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history

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

Change-Id: Ia690fd66cd5a944cc20b8523be6e3ac2f3cb03f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 07:07:16 +00:00
TreeHugger Robot
dfa666c9ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 419d424c0b -s ours am: fe42f4f23e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia21fa3d690a043509de6e3bdb91edf035026ea5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 06:54:14 +00:00
Bill Yi
1b38181c54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4bf6f099aa -s ours am: 8f805f1682 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d2357609955d6e00f9a1877d76addcf90e0e38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 06:54:13 +00:00
TreeHugger Robot
ff5899ef03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b7c595c4de -s ours am: 28a9480649 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia09d16e67cd24f2062286628ff09a5eb2b332c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 06:52:11 +00:00
Bill Yi
12bfca5750 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b11c37e6f6 -s ours am: 835e89de33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d6806d9f9caac084b2a867d045468fc3b07aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 06:52:09 +00:00
Tom Hsu
db94f350cb Merge "Remove Numbering System preference if no corresponding locale." into udc-dev 2023-03-23 06:41:37 +00:00
Jason Hsu
0ae5628d5f Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev am: 0ef1b05630 am: 79e8878f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809666

Change-Id: I63cc8717d505d139bf0ed2d8c696d56802f747c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 06:29:55 +00:00
Josh Hou
3a03857139 Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173333

Change-Id: I3d91cd2c803357778718e7d70350aa73c4cec675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 06:28:32 +00:00