PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,676 Commits 1 Branch 0 Tags
e07d619a19fec1e5bd925709eb86d92851ac85c9
Commit Graph

104676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e07d619a19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours am: 75cadf738b -s ours am: c7c64676f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide263893ad714267b8e818d22956a97c322de413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 21:28:33 +00:00
Bill Yi
99f4399147 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours am: 910530931f -s ours am: 66779a5357 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cd20b51f56f9318ec6726dc3367e20eca57e203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 21:28:15 +00:00
Treehugger Robot
c7c64676f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours am: 75cadf738b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bd2b32ed9e822b026165ab01c0d10e7285e88dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 21:02:16 +00:00
Bill Yi
66779a5357 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours am: 910530931f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b14a472c83060809f8e28f705467145b2893437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 21:01:57 +00:00
TreeHugger Robot
0df7bb86dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours am: c64edf7b3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9b19eeaafd87b91c269a6971667967aa8d31874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:43 +00:00
Bill Yi
250e236ed6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours am: 070b5431bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic69bb16d8a8560d1b50f3e62ffce201ce311ecd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:36 +00:00
TreeHugger Robot
95858898f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours am: 789c7d4d0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56f8438b2be6fd45cdfc2a4b9b1d697b9bf88ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:23 +00:00
Bill Yi
9c85ce5af4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours am: cf50c84e8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6e9d243f3ff38028d364726b7da9d18acbba38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:56:13 +00:00
TreeHugger Robot
c64edf7b3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3441f146bc9070e8ab71cfb205edaa8363c9c903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:49 +00:00
Bill Yi
070b5431bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f0eb3e6195e1f40169fa3f1d36c1fc6963867bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:31 +00:00
TreeHugger Robot
789c7d4d0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d87a4e080463d2d70798e1a67c0d023bd9b31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:23 +00:00
Bill Yi
cf50c84e8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92013752f94269892d8c0bd1c38746c1f6a8a3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:44:05 +00:00
Treehugger Robot
75cadf738b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I457f144c16992753458de5d48f16ec254f9a336a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:19:19 +00:00
Bill Yi
910530931f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44cb030d201c6df90d090ff8234522498911a1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 19:19:06 +00:00
TreeHugger Robot
4c17586a46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I088df48f402c1217ccfc1b619d3e76038fb353a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:53 +00:00
Bill Yi
3b0f1d48a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia586436aa44f5f458cea5fde9cc8b37e3728d551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:40 +00:00
TreeHugger Robot
f1ba850f94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39ff50f3c1f5b355735f5d760ba37b1a53cb1cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:25 +00:00
Bill Yi
9b2202a558 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec8a8d2ae56e0156cb47cbbee266968739856491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 18:54:11 +00:00
TreeHugger Robot
18675f81a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
3837351d59 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
95b4c4798d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
059271dcc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
Treehugger Robot
c2d1ef5127 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:31:02 +00:00
Automerger Merge Worker
00d1058c40 Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours" into tm-d1-dev-plus-aosp 2022-06-06 09:26:56 +00:00
Raphael Kim
6293ac5d63 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: cf9516b716 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Id0f55898976c0d58436ca865d1113f186f293d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:45 +00:00
Raphael Kim
16fe784189 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I41e2b49cb6a9eceb1267f5afd5e71bcc46e5923e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:45 +00:00
Raphael Kim
0a5f62976c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I985362cf5320eff9611095da1383b605ea0b6cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:11:20 +00:00
Raphael Kim
cf9516b716 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I6b2e8e9a4182e6f0dd25e63bae907c3331bb29aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:09:40 +00:00
Raphael Kim
a2b94beca8 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ib29e5d311bf6f13e6ecc06d55d72a56c2d93e246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:53:57 +00:00
Raphael Kim
aa31e245ab [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:32:35 +00:00
Raphael Kim
8da96d69dd Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:00:18 +00:00
Treehugger Robot
c5c6474b70 Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 am: 4494e0fcfe am: 0570287625 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: I9381f259b1956819177266a2073d711bf6bcb260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 07:53:07 +00:00
Treehugger Robot
0570287625 Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 am: 4494e0fcfe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: I29df0438b0286cd08ecf714585d60bf234985321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 07:38:18 +00:00
Treehugger Robot
4494e0fcfe Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: Ia42f377f4688deb033a87d7ea47e9c4194980517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 06:52:27 +00:00
Treehugger Robot
2bec16eda0 Merge changes I0ea498d2,I2d650eb3,I8adcf27e 
* changes:
  Grey out LE audio offload switcher as LE audio isn't enabled/supported
  Unify the LE audio string and refine the layout to put LE audio switch together
  Add LE Audio feature switcher in the developer option menu
 2022-06-06 06:37:11 +00:00
Bill Yi
36ddfc8853 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8eda8d180aabb5f47b910e3ec312396fd207e308
 2022-06-05 22:17:02 -07:00
Bill Yi
88b4a11c90 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81fb26845d241e6c415fb5e57c8a96622c01e4bc
 2022-06-05 21:57:47 -07:00
Bill Yi
71660567f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5c968be7dc8df7de1548f9e84940619e2dfa970e
 2022-06-05 21:54:11 -07:00
Raphael Kim
d6353487cf Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev 2022-06-05 01:54:28 +00:00
Bill Yi
aa1b476569 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic528a7fd27a359811be598d1b08467ee883e7b1a
 2022-06-04 01:05:23 -07:00
Bill Yi
2b6409fe37 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6476c920020034a0b118ca3d73a10860cd178f51
 2022-06-04 00:51:40 -07:00
Arc Wang
7501609c49 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -s ours am: e4771d0706 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: Icd8adf2854213e30f59bfb8cd7b9b1c5223cf703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:21:45 +00:00
Tsung-Mao Fang
561ce068db [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -s ours am: 5fd3f89a33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib44443a992f9720a398857d75c90d9cf5f1bb1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:21:44 +00:00
Arc Wang
f3f46a1124 [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours am: 7c863fb69d -s ours am: 4560b69963 -s ours am: d1135c52b3 -s ours am: 2a36e2f772 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb349766f76fe791ce42ef5b45ab66cc50357156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:21:43 +00:00
Arc Wang
cbffafbccc [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -s ours am: 9d4fa149ad -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I2aec1de68959a52b5a0cacf74ec30c991c0ab667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:14:03 +00:00
Tsung-Mao Fang
8ec5a4c42d [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -s ours am: a4b007cc8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8427d2bf98480c3e71a8c2e6dffc101ddc95727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:14:02 +00:00