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

104767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
dc72a4a14f Merge "The UI only shows the active LE device" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Jason Chiu
846d0286a8 [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow 
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
 2022-06-24 08:21:34 +00:00
Jason Chiu
5df14831b8 Make bluetooth not discoverable via large screen deep link flow 
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
 2022-06-24 08:16:41 +00:00
TreeHugger Robot
fb2bd662ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d8f62997fef6fe12ef4cad3d12b19833841d2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:43 +00:00
Bill Yi
5d82388879 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4b16e3515455fb7a05131d434e325761c73fc7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:31 +00:00
TreeHugger Robot
0e80df376a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia688688440b1b465e21341fbf6c4ba177ea4f507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:18 +00:00
Bill Yi
d72a7b2e10 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: e780500266 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb35d1f0647dc761802e593215c162f026a61e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:08 +00:00
TreeHugger Robot
3c670f625b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47acf265f965f1c11d120fda0dfc7e6722d92996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:40 +00:00
Bill Yi
1b6e655273 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d799cd34b481248a08d8370ef17487ec6869336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:30 +00:00
TreeHugger Robot
70e38435d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Id695b1fd9d940d8682fb7b7835270dac9fd2ca54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:03 +00:00
TreeHugger Robot
91d1b5cc61 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:42 +00:00
TreeHugger Robot
8b49ce00c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:42 +00:00
Evan Chen
bd2b5e7bfb Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev 2022-06-24 04:25:49 +00:00
TreeHugger Robot
ce2405e922 Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev 2022-06-24 02:38:54 +00:00
Bill Yi
d7c955786d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I781041fbff5a1e1ba47e8671c88dd49231616c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:52:13 +00:00
Bill Yi
fcf5908f6e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8aa57adff7e1037938d00ff65ef1e66a985e72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:42:36 +00:00
TreeHugger Robot
fc55b18096 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 886b1ed6c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93193a2e78f716760515a92ced1bb541a46cba2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:42:31 +00:00
Bill Yi
d4daeda7df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 914aa7d423 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11def45e0e0820516c924245b9a3928d4319cb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:42:20 +00:00
Bill Yi
585271038e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: 29bb5a7941 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83bf5a0d292d7d9794a08970bcf15ae3630758bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:42:09 +00:00
Bill Yi
9e020b5dc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d52aed366853fdd6d49e08834224a4c1328e9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:33:58 +00:00
TreeHugger Robot
886b1ed6c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I53f1fdfeebd1b931481610b5d4c47c879a472950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:33:08 +00:00
Bill Yi
914aa7d423 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68918c514fa91015b8cee9915ba253c9d0f5aa32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:32:58 +00:00
Bill Yi
29bb5a7941 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If79f019dc6606c2160f81801d26d1caf604b4f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:32:48 +00:00
TreeHugger Robot
2d21dce94b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9c9c5f80f081bbc46f2d9584da1de779dd8a19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:26:08 +00:00
Bill Yi
b716d79126 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e5678837487f60f7bdbd9685637048f582b4079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:25:59 +00:00
Bill Yi
7f9fa7fedb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0a4aa6df5b5a9e09080d679dae93f7221f75617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:25:48 +00:00
Bill Yi
e8196e4539 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours am: 7ef26b068f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab578a2f584f941cd3b4e1ad923ad0408a8784f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:25:32 +00:00
TreeHugger Robot
d9c622001f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours am: efd715f248 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfaa41acff94a790862037530bb20ca23ee4650a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:24:11 +00:00
Bill Yi
37695505db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours am: 92aba93e39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6eecf347305393267621414251ead0dacb803f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:24:08 +00:00
TreeHugger Robot
4567625969 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours am: f8e852db28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I827035a4f4156ea182c053723c2ae848939c40c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:24:01 +00:00
Bill Yi
82d4c86cc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours am: 76894ab4b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98118bd482bc44d90ca3f4404a074d8fcefecb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:23:58 +00:00
Bill Yi
7ef26b068f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2991895088d2be0dda22da1253d9cf11d1e648a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:23:38 +00:00
TreeHugger Robot
efd715f248 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2917446b4340d201528b209c81c6c3f0adf645e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:15:29 +00:00
Bill Yi
92aba93e39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic125eee7bda03257b5b87ffc96461df31549fc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:15:26 +00:00
TreeHugger Robot
f8e852db28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I354b2df7f8084dacefd5a8e1c8f6d3f61a447377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:15:21 +00:00
Bill Yi
76894ab4b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0e40c826570c2ca3e93c8b41d298066b10f73e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:15:16 +00:00
Raphael Kim
13b6d85e78 [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: fbfa9e2df7 -s ours am: cf3fe49391 -s ours am: da80f7abf8 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

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

Change-Id: Ib260e6a406d94fb9abd0fec5b42a6740b18055ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:15:06 +00:00
Arc Wang
33aeef8364 [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: a58d975aa0 -s ours am: 5f46cdb737 -s ours am: c47ee0a8c6 -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: I150bf89d06f890241f0b65fca19dd172c2de6206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:32 +00:00
Tsung-Mao Fang
9a0314ab85 [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: ecde630b9f -s ours am: 0572826178 -s ours am: 08c707a619 -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: Ic9768da6cce36f4f4299453d0ff02ca5b46ba431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:31 +00:00
Arc Wang
2e72d94db7 [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: e6135eeb89 -s ours am: eb1d86b66b -s ours am: b356e927d8 -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: Iacbf9af9a0eea06519490b02b322cb47fc341204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:29 +00:00
Bill Yi
4fcc193a8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaedf643640450877cb8781bfea1ff15983af08db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:20 +00:00
Arc Wang
03148145c4 [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: e7ecf11a38 -s ours am: f026e9b800 -s ours am: b41c3e65ae -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: Ie4ebb7fe9ed169d881cfcfe09ff98a09d307479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:18 +00:00
Tsung-Mao Fang
bf4a614864 [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: ab42aa1a96 -s ours am: 6d3f4e10cc -s ours am: 98131b8644 -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: I5f97c2f1ed10fb22222f43555e7d8d47b874fded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:17 +00:00
Arc Wang
98dd231188 [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: 8d2a48f22f -s ours am: 08df31aab0 -s ours am: b53ed091b3 -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: Ib176b977211eaab2f8ba685b5c8d04529cdbfd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:09 +00:00
Tsung-Mao Fang
db838bf1a6 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: fa1c525740 -s ours am: 09f20493a8 -s ours am: 0b28b84745 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f5a65a3f47edb6b3a7c37d418faf30bbaf2cdec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:08 +00:00
Arc Wang
8618ec09a9 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 am: 8b268b18fe -s ours am: 1834c4bbfe -s ours am: 7fcf96d599 -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/+/18704659

Change-Id: I16978a7457cfc2a36d597b5bd92a8068168fe3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:00 +00:00
Tsung-Mao Fang
92a909e948 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 am: 6315e164f7 -s ours am: bf095a51fa -s ours am: 6cb16367a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e06f5e7851d3756821c3398f290a9a5a642c4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:59 +00:00
Arc Wang
c585fa3f4d [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod am: 966a2dc8d2 -s ours am: 39fbff813e -s ours am: 82fc149aa7 -s ours 
am skip reason: Merged-In I044b680871472a3c272f6264c4ef272df542112e with SHA-1 67b9fb57ea is already in history

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

Change-Id: Ia2aa2d0195641e871c6e4cc56fbc7149905ccd21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:52 +00:00
Presubmit Automerger Backend
04a9796b13 [automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea am: 03dd4cc7d2 -s ours am: 719c5bf03e -s ours am: 74c53ed19b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dcf6f409babb6558a2d7bd7e020670b8ef79e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:49 +00:00