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

122064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Milantev
1bed9d09bc Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2 am: 179d3d41aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Ie203aba50b016c3fb6f84714cd1be89cd97737a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 19:08:32 +00:00
Josh Hou
114059581c [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: 1e73fa1555 -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: If6dd9ba8f39fe706ee511f0fe23bf9fdc281c304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 19:08:22 +00:00
Tom Hsu
3bee7b4763 Merge "Remove Numbering System preference if no corresponding locale." into udc-dev am: db94f350cb am: b31390c086 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122897

Change-Id: I7084a4756a9ff5985fff16dc8b25f4d8cc2f1899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 19:08:01 +00:00
Ioana Alexandru
e230f326c3 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 am: 164ef2bc06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I9b96ca99ca659df6cd75f748d5031494bbe24d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:57:22 +00:00
Alexander Milantev
179d3d41aa 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: Idc79a3e928daefc8ae86b4097cad51b4819cc27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:46:51 +00:00
Josh Hou
1e73fa1555 [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: Ia8f99fff9e746e269e0f59e43762bc017ce04326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:46:41 +00:00
Tom Hsu
b31390c086 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: I4f93cea7045a6b4a1c5a074a5e384b50e5244b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:46:29 +00:00
Bill Yi
9a1fc1b93e Merge changes from topic "tc_change_23032218_17" into udc-dev am: 8e1e45468b am: 569ceb7d56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22202160

Change-Id: Idc8cde26fd1266a9d44bb2341efc7eb30453a7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:44:34 +00:00
Bill Yi
93090a0ac4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de am: 2433e07070 -s ours am: c1bb86850a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4664632c78525653e4e5e0f7832902963d5982e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:44:25 +00:00
Ioana Alexandru
164ef2bc06 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I10ddb90f41cbaf022d5d90777477c44b6cff03a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:38:52 +00:00
Daniel Norman
cf9b1297c5 Merge "Update Settings animation to use new slide style when in SUW." into udc-dev am: c76b568914 am: 5441771b20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163924

Change-Id: I308f7d77f7e48345a2739e276fdc7842ea968ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:25:14 +00:00
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
Bill Yi
569ceb7d56 Merge changes from topic "tc_change_23032218_17" into udc-dev am: 8e1e45468b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22202160

Change-Id: I03f0efb892e763930fec4e4643d300bc355bc463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:05:35 +00:00
Bill Yi
c1bb86850a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de am: 2433e07070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1ca5a514bf969fbc43b8810cf2aa0d072d03e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:05:23 +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
Ioana Alexandru
f8662a4f40 Merge "Clarify notifications behavior in bypass setting." into udc-dev 2023-03-23 17:53:25 +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
Bill Yi
8e1e45468b Merge changes from topic "tc_change_23032218_17" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-23 17:46:19 +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
Daniel Norman
5441771b20 Merge "Update Settings animation to use new slide style when in SUW." into udc-dev am: c76b568914 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163924

Change-Id: I9daf33134aa090e74ee2d062b5b7649b3226489c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:42:40 +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
Daniel Norman
c76b568914 Merge "Update Settings animation to use new slide style when in SUW." into udc-dev 2023-03-23 17:17:20 +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