PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,729 Commits 1 Branch 0 Tags
fa3de1919bf03451fd1a7809b88eaaaeb451838c
Commit Graph

109729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7b032170cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: ea5907aeae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c2dbff72e3579fcabd5f26719dc0e2f1ed623a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:02:45 +00:00
Bill Yi
962ef907c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: ea5907aeae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3eba101c03826d7845d4bd07a35a28e86af491f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:02:29 +00:00
TreeHugger Robot
1f278e5927 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c07c029ea4 -s ours am: 014c4e42f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f1dd5e8aa0ac0da23ff300aa584dcacaa0eef25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:02:22 +00:00
Bill Yi
df497df78f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2599aa711e -s ours am: 1c8a4839ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ca8a353c0e1aef3d60244cf4f53080f60a1f4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:02:07 +00:00
Bill Yi
aae3efd3a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 2cc27bc744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c477aa374db4dbfd149e20bd37152c5abef6bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:01:55 +00:00
TreeHugger Robot
969232f4e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e2ecbcb007 -s ours am: f6588837d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22f1da8cb858f5eb940b62f74b6d5978eb5ff5b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:01:54 +00:00
Bill Yi
5f8cc84041 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02b1b0b3db -s ours am: 6562cf2eda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb1e4b62f67ad4b5d816c6c2006f762e28236915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:01:42 +00:00
Bill Yi
8aecbd9df4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 74bb796c67 -s ours am: 615d2d7cc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfbd864a8aa6301254f4905dffe33d19cbff09f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:46:09 +00:00
TreeHugger Robot
d8e9a267cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3faca04cf31d63cf8336ee8acab098cb450704f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:44:46 +00:00
Bill Yi
ea5907aeae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0375c5e00aa7a6a8fef1b96407e624359363908d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:44:30 +00:00
TreeHugger Robot
c484ac981e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9073902b4178775ca9f68828ab232430d185aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:43:52 +00:00
TreeHugger Robot
5427fb0dbf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0126d7bcaf8f8c91be065baeeb77cf3d52ee9206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:43:42 +00:00
Bill Yi
9ba1e26bdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc9231c1d7e7ca25a556d32e7a62bbc97589927d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:43:35 +00:00
Bill Yi
5fac07d5ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95fd589b5be408d561d73c5b1a18e420e789f63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:43:26 +00:00
TreeHugger Robot
39ea796671 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3f63399f7 -s ours am: 6412892a07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I924e1bf85e71ba26199810ab417acc108481cce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:43:18 +00:00
Bill Yi
e7b690da0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62a52eccea -s ours am: affd76cf96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32ff4b99694867507224c99031316280769ec58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:43:03 +00:00
TreeHugger Robot
842688acd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d097fe6e2f -s ours am: a62104d2b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18861ecdc5791c4bbc109f46cfd1f04c4b0fecba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:42:49 +00:00
Bill Yi
e6943f7634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bc13fac28 -s ours am: 47937dbd55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b9895b932eb84b5b4f3dfc1940df44c2bb46665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:42:36 +00:00
Bill Yi
2cc27bc744 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6af815ee0f119c755a3b9414c4092d46caef9bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:42:18 +00:00
Bill Yi
b8a8d5b643 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 74bb796c67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifddfa46a5fb334e85fa974e49dd55d8238b316f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:37:08 +00:00
Bill Yi
615d2d7cc4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 74bb796c67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I676ddf11fbdc7542bea2215728e05bd83f94ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:35:47 +00:00
TreeHugger Robot
1c60092e59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3f63399f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ecc198a8f7e4dee254ad1996b66fac8b7ca8962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:33:26 +00:00
Bill Yi
28a7510243 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62a52eccea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad8b8bb94ca9fc261d7ce12b21829d50a9412552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:33:20 +00:00
TreeHugger Robot
5fdd0b386f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12819ca7ba3388a2d3379ba419f489086ca090d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:33:10 +00:00
TreeHugger Robot
229b1b70cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d097fe6e2f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71231b17dd216cacd2c1afd7a884f4c78f622597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:33:03 +00:00
Bill Yi
6db82b3062 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09c5bc7d92a8b7c1371d938c219b0cf0d2ebacc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:32:50 +00:00
TreeHugger Robot
6412892a07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3f63399f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia588d05a5c144e7a88189f71fa8b41879ce8fb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:32:42 +00:00
Bill Yi
f45ffcfb2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bc13fac28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If110592529a0d3d25065daf17c0b3363f9ae91bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:32:32 +00:00
Bill Yi
affd76cf96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62a52eccea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I344b4ed43a6ec1bd32ddd067c75d4699e65c0ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:32:31 +00:00
Bill Yi
74bb796c67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10f818e527b6b9329305a4f4d706210911934c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:32:30 +00:00
TreeHugger Robot
a62104d2b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d097fe6e2f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I275ab9e23ac208d886abba0d67b695fcfe2ba05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:32:14 +00:00
Bill Yi
47937dbd55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bc13fac28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fc840e69ad3b0353424a8022922666ed4e1fd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:31:54 +00:00
Bill Yi
223c361bb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3db5616ca28733d5c41ca14534f3aa0132f9a731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:31:28 +00:00
TreeHugger Robot
014c4e42f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c07c029ea4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06d14206d90214d0f28b888b64de7fd82536a963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:30:22 +00:00
Bill Yi
d28e552f18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4c9dd453c4b845cdde6abefbf8eb3ddd32c7619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:30:00 +00:00
Bill Yi
1c8a4839ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2599aa711e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib06353e017ca52d3155c68d30e4cb9b838251ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:29:55 +00:00
TreeHugger Robot
f6588837d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e2ecbcb007 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5619e022e448a018c30d78d7a5d67c22ab6561a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:29:40 +00:00
Bill Yi
6562cf2eda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02b1b0b3db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea79a9759e68b92ad45b5cde77c174ba476f26a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:29:30 +00:00
Weng Su
77f9cbe315 Refine carrier Wi-Fi functions 
- Sync the same design to query and set carrier Wi-Fi enabled status from MergedCarrierEntry

- Add more logs for issue tracking

Bug: 227236604
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         WifiPickerTrackerHelperTest

Change-Id: I869fa97bd24ed31a3224b4a395ffc97a17aa1471
 2022-05-24 03:16:36 +08:00
TreeHugger Robot
b3f63399f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-23 18:51:30 +00:00
TreeHugger Robot
d097fe6e2f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-23 18:51:30 +00:00
TreeHugger Robot
c07c029ea4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-23 18:50:47 +00:00
TreeHugger Robot
e2ecbcb007 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-23 18:50:47 +00:00
TreeHugger Robot
f398b474af Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-23 18:49:25 +00:00
TreeHugger Robot
256d5aef09 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-23 18:49:25 +00:00
TreeHugger Robot
a39043d1ab Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-23 18:42:17 +00:00
Tom Hsu
23a7c73ee4 Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 7a69cee691 am: c0f0ad8adc am: e8fe948d42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260

Change-Id: I52da6e42d4cf8729c82c22d692e8355f5dc27662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 18:11:08 +00:00
Tom Hsu
5e19ae4327 Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 89f6686597 am: 22e0b9beea am: e29b4b1cba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260

Change-Id: I7e391b67920462987c0d77dc43ded97d9c3b173c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 18:09:45 +00:00
Tom Hsu
ba372ce8b6 Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 7a69cee691 am: ab7057cb7f am: e2506fcdfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260

Change-Id: Id8951b14544371e4883c7bc51aef7bc177f356bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 18:08:15 +00:00
Tom Hsu
e8fe948d42 Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 7a69cee691 am: c0f0ad8adc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260

Change-Id: I6472807f528eecc585f10aad11bbddc2e1b8183d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 17:38:25 +00:00