PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,541 Commits 1 Branch 0 Tags
c1fd1de25bd85c1ca59b12511e17ab559e7b592d
Commit Graph

103541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yi-Ling Chuang
c1fd1de25b Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: ccc866a16f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I87d58a374fc4afbc1c8d3e5ce47d1803cfd23b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 04:15:06 +00:00
Yi-Ling Chuang
ccc866a16f Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I4d5346f3cc0764cb94aad41a19ccf52a6b0b0831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:45:30 +00:00
Yi-Ling Chuang
f6c416054e Merge "Make the force stop dialog work properly in split screen" into tm-dev 2022-05-12 03:23:11 +00:00
James Lin
c34fce8adc Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: 97cfcae36d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I93174ca18ce0b7efed95890d673cfcc3cd8c5892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:11:15 +00:00
James Lin
99d0a952f2 Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I70cde08d7b556037a5a75162857b7d9a825b43bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:10:51 +00:00
James Lin
c7eea3d1b7 Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I27181686e44f979d4989f38b8d91b32549be6d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 02:31:53 +00:00
James Lin
97cfcae36d Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: Ic5e68e6647e6476d12b711e211a7d93fba92e083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 02:30:14 +00:00
James Lin
14c7ce7ccb Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev 2022-05-12 01:26:34 +00:00
Ayush Sharma
f661c3a21b Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 71d5366bf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I50979707076f5c23223759faa42b23dd23246412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:56:18 +00:00
SongFerng Wang
624f7ff6e4 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: e48d3f8cc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I7f9fd919138ccb9278fab1663742d909604178e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:48:21 +00:00
Tom Hsu
011bf465fd Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: a3b5860398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I29d101bc524384f3f5304c5deae825e898fcbd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:46:55 +00:00
Ayush Sharma
cd10322d6d Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 02d58f0109 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I1dae906847c895beef40a731d6e45bf59d411670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:43:02 +00:00
SongFerng Wang
d100f24a62 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: bde99c02cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I2b7d2833a72412e359fa1680ab2852edec58672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:37:51 +00:00
Tom Hsu
b90a6c8c81 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: b903b4a057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I6bc2490339d6052629c722fe89f8547f3cb7c978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:37:32 +00:00
Ayush Sharma
02d58f0109 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I0e71a2917ae7b26073d9de217e7909c729084613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:28:24 +00:00
Ayush Sharma
71d5366bf6 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: Ieaf89ca741ebb7a776300a1c9354f14d1339874a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:27:54 +00:00
SongFerng Wang
bde99c02cc Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: Id6017f330b9c7071e0df48d48ca2319b0b865365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:27:36 +00:00
SongFerng Wang
e48d3f8cc1 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: If66c750d52a403831eae88340c5bc7d9a04da353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:27:06 +00:00
Tom Hsu
a3b5860398 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ib9e7b7aa2d36c132c1befefde363c3dc7e7bdcdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:20:26 +00:00
Tom Hsu
b903b4a057 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ib2e09e95c6dbef9b54a8e1182e5f3b57ed0d0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:19:02 +00:00
Ayush Sharma
695a47e469 Merge "Fix issue no action on clicking link in footer" into tm-dev 2022-05-11 12:56:44 +00:00
SongFerng Wang
55ded566e3 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev 2022-05-11 11:17:28 +00:00
Yi-Ling Chuang
2754a20c72 Make the force stop dialog work properly in split screen 
When it's in a multi-window mode, force stopping an app will lead to an
activity recreate, and the dialog fragment will also be recreated.
That's why the dialog still shows after the button is clicked.

Hence, dismiss the dialog before stopping the app to fix it.

Fixes: 231529730
Test: robotest
Change-Id: I75d27624f0c60bb617e7d1a92ffe01d3c0fbf7be
 2022-05-11 17:07:38 +08:00
James.cf Lin
85db3167e2 [Panlingual] Remove the warning message from AppLocaleDetails 
Since opt-in is enabled and it will only display locales that are available or downloadable, there is no longer a need to display the warning message to users.

Bug: 228923650
Test: manual test
Change-Id: Ibd98f3a292eb09c921f4bf00dbf448c976927e5d
 2022-05-11 15:20:52 +08:00
Tom Hsu
d375456251 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev 2022-05-11 05:51:00 +00:00
Arc Wang
6ea2ae7fe8 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: fe4df8e6a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c92fd1e645d3b83ab608fc84a7ab9fed7a620b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:08:03 +00:00
TreeHugger Robot
10ee27e781 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: ebd46572c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I0eca1b2ff8faf38961b47f51ce9119423d281465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:07:50 +00:00
Arc Wang
5bdf17dd57 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38328ae8b87163d8e4215e602411bd7c73193105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:07:46 +00:00
TreeHugger Robot
b53549a4c5 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: Ib7e0937ab4ae2e61664e69054d4f3db5ab91312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:07:40 +00:00
Arc Wang
6e9fcaa1e3 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I572ec0d060af1bf8d741a15dcfeddba5df991820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:39:19 +00:00
TreeHugger Robot
0fa209b89c Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I683531b19121643ea5000d3bdd4344d0c7c9cfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:38:59 +00:00
Arc Wang
fe4df8e6a8 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff1011446823c7e647d4e85b420c94aecf5593a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:38:02 +00:00
TreeHugger Robot
ebd46572c4 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I1d4d1936e6b5c5d556db078d2481c772826d1135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:37:25 +00:00
Arc Wang
14cdcb1845 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 006b5b4102 -s ours am: ef4edd0a54 -s ours am: 4786e9074e -s ours am: cf76d97ee8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb7968fa390c868c213f98e9d07bebb7f6217a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:29:31 +00:00
Arc Wang
93f8a23121 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 006b5b4102 -s ours am: ef4edd0a54 -s ours am: 4786e9074e -s ours am: 2c8ac66c10 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60447e01d6b5997114a722e5dcaf83750ae429c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:29:25 +00:00
Arc Wang
ce006f6122 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours am: 1a352ac71c -s ours am: bf6d1965b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I921928be849b2f225c13d0e2d19fa466bc4ef3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:29:20 +00:00
Arc Wang
6c77e5474e [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours am: 1a352ac71c -s ours am: 1b40f16b0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f62a740cc0abbc4c47e24ef2e592851f6291d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:59 +00:00
Automerger Merge Worker
19c8c9f28f Merge changes from topic "am-de453557dcf94cceb03fbe375936666c" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours am: 40c3a3ac6b -s ours
  [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours am: ad75641b27 -s ours am: 05797e8bc0 -s ours
 2022-05-11 03:28:41 +00:00
Arc Wang
c27888e778 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours am: 40c3a3ac6b -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: I690c656115d2deaffb70ac42e9cf708b7becc389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:35 +00:00
Arc Wang
96e922d694 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours am: ad75641b27 -s ours am: 05797e8bc0 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: I87c95f163906f3447d7c12f8f631b5e85ee3f152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:32 +00:00
Arc Wang
42d1d95dbc [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours am: 3478713e2f -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: I20591326e6450f19f100a1a87b2a64d6b66ac217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:30 +00:00
Arc Wang
8131f4f9d2 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours am: ad75641b27 -s ours am: 92d39fe026 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: I3e9bd9ac46a6f88a4943aefd50dad93eab9c0271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:29 +00:00
Arc Wang
82f4c614cd [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours am: 5a71f10f08 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

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

Change-Id: I8db1c7992864370607f1d8616a0a602d2298760d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:25 +00:00
Arc Wang
75e78a8e53 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours am: 868417c5ac -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

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

Change-Id: I61661b2803bd38575000abaadd2d33e635c52ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:28:17 +00:00
Automerger Merge Worker
54a77adbb6 Merge changes from topic "am-b0441449ba0041069ef7bc6ef763a79b" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: 2211d5cf79 -s ours
  [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 124359ecb5 -s ours
 2022-05-11 03:27:36 +00:00
Arc Wang
5a7fecd6a8 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: 2211d5cf79 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: Ia24b80d86b2ec8dffe15ff86a38da5eb4baad8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:27:31 +00:00
Arc Wang
703e94b10b [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 124359ecb5 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: I44b477205d8f35f5060dfd050a899ff94f61b56f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:27:29 +00:00
Arc Wang
dfeb9ba035 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: c8d76ad2ef -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: Iae06daddf746d5a3be1dc99a51bc3c8d6f763508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:27:28 +00:00
Arc Wang
5925b4e186 [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 5167d5ff4d -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: I2a1cc2489286854c3c1a5611aa1d4fd077c8161a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:27:26 +00:00
Arc Wang
335cf2ccb8 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I328d6a1e0617d3757f71cdf9687cac8ba8c4dfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:25:46 +00:00