PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,648 Commits 1 Branch 0 Tags
c38d1a913cc9b1de0f4599e5be84110d2486dfb0
Commit Graph

110648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Kim
c38d1a913c [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: b00af0df94 -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: Ic315f3460960beeb24bfc0f4831f12ae5a390e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:26:10 +00:00
Raphael Kim
b00af0df94 [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: I46790fa4395f15742722d93d97ff81026c895743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 09:10:37 +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
TreeHugger Robot
cc1b699236 Merge "Show full package name in cred app" 2022-06-06 08:32:14 +00:00
Treehugger Robot
413494717d Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 am: 4494e0fcfe am: 0570287625 am: c5c6474b70 am: b7cb8d2e21 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

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

Change-Id: Ia4544fef9ee7d7428d9c430da2b68fb2c820538d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:07:06 +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
YK Hung
196f434391 Merge "Clean up unused string resources for legacy "optimization mode" design." 2022-06-06 06:39:35 +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
Kuan Wang
c6d2eca7b8 Clean up unused string resources for legacy "optimization mode" design. 
Bug: 232037602
Test: make RunSettingsRoboTests
Change-Id: I22650df5444c544bd9d729c95044a42d9b6e5b66
 2022-06-06 11:56:38 +08:00
Chaohui Wang
6a2f24a463 Merge "Clean up unused mp4 files" 2022-06-06 03:28:20 +00:00
Chaohui Wang
75960ef768 Clean up unused applications_settings_summary 
So we can clean up all the values-*-nokeys resources files to save APK
size.

Bug: 234570979
Test: make Settings
Change-Id: I7ac08d2e66357fccf34b86e8239c5ea507e48d48
 2022-06-06 02:40:52 +00:00
Kuan Wang
02b6451258 Clean up legacy "optimization mode" design. 
We have two different "Optimization mode" page design in the android R to support bi-state for AOSP and tri-state for Pixel device. From android T, we always show tri-state for both AOSP and Pixel. So it's time to clean up the legacy design for bi-state.
This change doesn't include string resources cleanup, which will be
included in a separated cl.

Bug: 232037602
Test: make RunSettingsRoboTests
Change-Id: I5194201d0b11e2dcea958d49bf07ed837a386465
 2022-06-06 02:11:09 +00: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
Chaohui Wang
5818455b17 Clean up unused mp4 files 
And their preview images.

Some video usage is replaced with lottie.

Bug: 234570979
Test: make Settings
Change-Id: I122ca4c231ba255257f9592ddcde63fb71f7966f
 2022-06-04 19:35:36 +08:00
Arc Wang
d75d0609d2 [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: 7501609c49 -s ours am: cdda36e6c6 -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: I4228314a6f17cda4c367349ee4f42b756c66f5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 04:00:26 +00:00
Tsung-Mao Fang
60aba95637 [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: 561ce068db -s ours am: ac1ce680c7 -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: If39cab6505c2b527b4fedf05783bfbc9f1173a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 04:00:25 +00:00
Arc Wang
5f73cf66a2 [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: f3f46a1124 -s ours am: f823b08d1e -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: Ie35dca96a52f06fce17fa5b7bfed8bc29fbce030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 04:00:24 +00:00
Arc Wang
d9b0f05ae7 [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: cbffafbccc -s ours am: 3ef0d72772 -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: I5030fd9ad2c4de55673369d9656f8869b3646607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:59:48 +00:00
Tsung-Mao Fang
af877bf374 [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: 8ec5a4c42d -s ours am: 1d2baec897 -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: I0bd0b5ac4163ee171d9e23634169c7a1bb2c3140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:59:47 +00:00
Arc Wang
03e194d5a6 [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: 88423a5bf1 -s ours am: b271e9e37f -s ours am: 5e7ba95f5b -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: Ib843642ac33fe6de76b91a8c871d87c50bac931c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:59:45 +00:00
Arc Wang
501b8cbe44 [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: 2acf102055 -s ours am: 04af60d428 -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: I3e3dc32bf17acdd9f33f2b04122745a391b34c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:59:07 +00:00
Tsung-Mao Fang
5c92d04c5e [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: e3fb3794b5 -s ours am: 031fad2e0b -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: I8b7061a4dc7e6621fa8bc957e2f1f540313a5696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:59:06 +00:00
Arc Wang
75e4024ba3 [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: f6821aa400 -s ours am: 0bc5cdf37a -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: I7d42e86d2f78a85af15e449268e6d86ca1a58642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:59:04 +00:00
Arc Wang
cdda36e6c6 [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: 7501609c49 -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: I77e5b67bdc7a44bc050258d95475c8cf4ebe3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:43:18 +00:00
Tsung-Mao Fang
ac1ce680c7 [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: 561ce068db -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: Ic124b6b452b2625c72a52eb4c2cef0f6ed20edf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:43:16 +00:00
Arc Wang
f823b08d1e [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: f3f46a1124 -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: I68091e1b028a8d43a706971ac4bc80b06ac94b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:43:15 +00:00
Arc Wang
3ef0d72772 [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: cbffafbccc -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: I1eccec2aca7409aabcfb1b296ed89b4f04d01806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:42:41 +00:00
Tsung-Mao Fang
1d2baec897 [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: 8ec5a4c42d -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: I8a02fe6c7e2605a5f8104019eca1fe864731d8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:42:40 +00:00
Arc Wang
5e7ba95f5b [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: 88423a5bf1 -s ours am: b271e9e37f -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: I4e804dcb574656a451f515c8b2ba1a078a97c3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:42:37 +00:00
Arc Wang
04af60d428 [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: 2acf102055 -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: I9793300beef4d6673f819b5a653bd772e13c5551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:42:17 +00:00
Tsung-Mao Fang
031fad2e0b [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: e3fb3794b5 -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: Ica437da680cc032f78988b4b489bae88f67c1cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:42:16 +00:00
Arc Wang
0bc5cdf37a [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: f6821aa400 -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: Ibbad347f782a67d2577cd155426777c148c7a921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:42:11 +00: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
2acf102055 [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: Ic953cd1a9c9621343eb5e9d57994a3d6952e38b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:21:41 +00:00
Tsung-Mao Fang
e3fb3794b5 [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: Ie895d1e700935cc59b673f9dfb51f8cf16478e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:21:40 +00:00
Arc Wang
f6821aa400 [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: I2af821a533dc294ba1b6fe6565baf02c3d15213a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:21:39 +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
Arc Wang
b271e9e37f [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: 88423a5bf1 -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: I1e594adc9905b5c2baebe3471f6bf76c41190273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:14:01 +00:00