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

110625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
menghanli
a70fd0937f Setup ToggleColorInversionPreferenceFragment test infrastructure 
Bug: 229831595
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleColorInversionPreferenceFragmentTest
Change-Id: I1b9c6f2472a68ce7e820dae6e56a88791c4dcf2d
 2022-06-07 08:10:19 +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
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
Arc Wang
a19d1bf111 [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: 263f74a7d5 -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: I90f743356b153ffee3234756b5a6b63c858a7a57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:13:17 +00:00
Tsung-Mao Fang
da033a12b0 [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: b21d5395e2 -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: Icd4046e71fc4b0945777437d1fa127047b10128c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:13:16 +00:00
Arc Wang
c6cd288a26 [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: 72f0527d54 -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: I150a8b2b633ef85dfec2c15233258dd24c237d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 03:13:15 +00:00
Arc Wang
e4771d0706 [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 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: I90dfebd32d6424832568fd0f807144f1ccf37535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:58:44 +00:00
Tsung-Mao Fang
5fd3f89a33 [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 skip reason: subject contains skip directive

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

Change-Id: I131a5b7edc178694dc1d9c9e35075d341ab34227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:58:43 +00:00
Arc Wang
2a36e2f772 [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 skip reason: subject contains skip directive

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

Change-Id: Iffe3c7383e3717cee73fa700f8dd4dc331f1ced8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:58:42 +00:00
Arc Wang
263f74a7d5 [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 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: I49acb558baead47a4a1c242ef6122bd736b38325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:45 +00:00
Tsung-Mao Fang
b21d5395e2 [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 skip reason: subject contains skip directive

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

Change-Id: I11a552e5c9786ee795f99adb54b86489d38168d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:44 +00:00
Arc Wang
72f0527d54 [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 skip reason: subject contains skip directive

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

Change-Id: I5b1e20d6f1e18191a90b8460026d322cd18948a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:43 +00:00
Arc Wang
9d4fa149ad [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 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: I9bc2354ed015d3802c85673fcee3d6198370cbc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:19 +00:00
Tsung-Mao Fang
a4b007cc8b [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 skip reason: subject contains skip directive

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

Change-Id: I755e2fa549d07e7aa590b78026f92b10d541f5f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:17 +00:00
Arc Wang
88423a5bf1 [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 skip reason: subject contains skip directive

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

Change-Id: I49ffd06963df7efb8baee3beb86da97a27daf1c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:57:14 +00:00
Arc Wang
1d71f3e2af [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 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: I410e4b0ff40a7e9ab5922b4542314b09e7e2dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:33:32 +00:00
Tsung-Mao Fang
e025e77430 [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 skip reason: subject contains skip directive

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

Change-Id: Ibbc64f16dd0303d4ca59a321486e1bb16b934654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:33:30 +00:00
Arc Wang
d1135c52b3 [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 skip reason: subject contains skip directive

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

Change-Id: Icdc188bafc752618012a111427f1d72cd0710002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:33:28 +00:00
Arc Wang
4ed310baa3 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 7541807566 -s ours am: f7dac28d6c -s ours am: b97618408e -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

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

Change-Id: Ie7cccf02330ec3dbcd75dbde6f8828c1b9679ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:28:16 +00:00
Tsung-Mao Fang
bb4bca283c [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: f93e140bb0 -s ours am: 173c6d2bc5 -s ours am: ac23115d16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd7b748a8aba7e0f520e01ba938f76fc3505875f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 02:28:15 +00:00
Arc Wang
ca2a78047f [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: a21406b20a -s ours am: fc4508f9e6 -s ours am: d7cf9ae689 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

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