PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,520 Commits 1 Branch 0 Tags
792b06992cf3079a500f9f1cebae90754f5ff57d
Commit Graph

108520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
792b06992c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac5ba6b7cb -s ours am: 5adfbcdc24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44721d6e9e08b608ba0122b20d4735394f5b49ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 17:47:22 +00:00
Bill Yi
5adfbcdc24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac5ba6b7cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb66e097e111e7c5555cd2da588986ae3efab730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 17:39:15 +00:00
Bill Lin
00d9f3a666 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 am: ab47efa4f9 am: 012b4dd530 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: I2943f9270cb8063c4a4160d4d78321375faf84cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:51:06 +00:00
Bill Lin
1b253beed0 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 am: c4492becef am: 69ce6cadcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: Ic954dc4066bb6d565f0571bffdf1893fa0a219c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:50:28 +00:00
Bill Lin
012b4dd530 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 am: ab47efa4f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: Ia1942dc5fe70a98b6c43ff16fe163e7c2e0a026b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:31:28 +00:00
Bill Lin
69ce6cadcd Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 am: c4492becef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: I987d4c6a4c71515e8040f4a2773bd74935103130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:31:03 +00:00
Arc Wang
961a40d5e3 Merge "Center apps Preference title when there is no summary" 2022-05-18 02:09:25 +00:00
Bill Lin
ab47efa4f9 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: Iadac0b4aa55b86354503798b3027a26596b5ef67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:04:57 +00:00
Bill Lin
c4492becef Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783

Change-Id: I48390a1462c42d2676f8d740f1bc7a8c05613c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 02:04:55 +00:00
Bill Lin
3db69adf01 Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev 2022-05-18 01:43:56 +00:00
Arc Wang
e4673a3dc8 Center apps Preference title when there is no summary 
Hide apps Preference summary when a summary is empty
then its title will be vertically centered.

Bug: 229646669
Test: manual visual
      Settings -> Apps -> See all apps
      Settings -> Notifications -> App settings
      Settings -> Storage -> Apps
      Settings -> System -> Language & input -> App Languages
Change-Id: I6fceba243e2ccac9ea180b940b571da07e1ba805
 2022-05-17 07:35:47 +00:00
Bill Yi
ac5ba6b7cb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c8978cfb133579ecf2bb4537228e63026e62868
 2022-05-16 22:02:32 -07:00
TreeHugger Robot
bbab32409c Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: f5b2d6bf85 am: 4271a34c16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Iacbe1558fb09a2c19f71268b8ce1704506a27988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:57:05 +00:00
Arc Wang
ae9e35a8e5 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 0e2485a762 am: 1a55855a39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Id2cb8a397c471d070dc8351dfe8b75d808b6c10f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:56:30 +00:00
TreeHugger Robot
1d382e7729 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 6e7e95593a -s ours am: 4e520cbeb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98bab765ab2ebac10e8ac51892793f4d215a9578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:39:11 +00:00
Bill Yi
94531cf016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: d2388e01b3 -s ours am: 21365f1d25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86b05f60e6ca792549a6f3d1908780e8f7dc7b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:39:03 +00:00
TreeHugger Robot
8db65cde5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: 14e9b89377 -s ours am: 8c15a74d62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54c61321396966a5478b347680031f2395f31d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:38:46 +00:00
Bill Yi
1bbea2a2d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: 74a4376590 -s ours am: 5de62a3ab7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f0bdde18142d0fca52a2f21d06024b2b7c63655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:38:27 +00:00
TreeHugger Robot
fa13540d9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6bc7ea75a7 -s ours am: 85f04741e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f77391cc47dea582875c0e4090ce130b795f38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:35:51 +00:00
Bill Yi
1f47db1dce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93bd223fdf -s ours am: 42caff50f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbfc1099bb4e5182adc79a79d267a254bf6d5bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:35:44 +00:00
TreeHugger Robot
77571a7688 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7b538df037 -s ours am: d67de35b9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib45fdf4cf478c94e4c543f38f9a2fb61be1aca12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:35:24 +00:00
Bill Yi
22bd4ab194 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c81a73dd -s ours am: 73958e15fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8162f181f4e6fff7c153c4036e3a9ffedd443548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:35:07 +00:00
TreeHugger Robot
4271a34c16 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: f5b2d6bf85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I2cff8564aad6e898040338d529c59eaca6e9c85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:29:18 +00:00
Arc Wang
1a55855a39 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 0e2485a762 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I01fecf6b807cae539b2304e331f05a497470c432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:29:00 +00:00
TreeHugger Robot
4e520cbeb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcd32c74c1 -s ours am: 6e7e95593a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I546264cb3d6591dc2fe63bf5b12e58ebdd3645b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:12:38 +00:00
Bill Yi
21365f1d25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e958634cc6 -s ours am: d2388e01b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8db0c97a6f75842ebacd38fe8731fb4acfa59cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:12:22 +00:00
TreeHugger Robot
8c15a74d62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours am: 14e9b89377 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f263aa47b781e5ebd929750217cb41e94c36f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:12:04 +00:00
Bill Yi
5de62a3ab7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours am: 74a4376590 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4262843457d4fb99e2021a548c1ae0f5782023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:11:47 +00:00
TreeHugger Robot
85f04741e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6bc7ea75a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae60069b5214f1588b528335e45e12b6611e114e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:08:03 +00:00
Bill Yi
42caff50f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93bd223fdf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic736fb436b499dbb11af6e6240ad41b15cc1318c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:07:41 +00:00
TreeHugger Robot
d67de35b9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7b538df037 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50b4cba5ea7daeb084910ea69d0f0e6492065b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:07:20 +00:00
Bill Yi
73958e15fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c81a73dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If90b0f6a940f8e8445a232b56454d02647483331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:07:07 +00:00
TreeHugger Robot
05cce4044b Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: a1c18a04f0 am: 5626e65991 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Ide1fef172aea36fa314b08b637d8f7179aa7078c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 16:29:56 +00:00
TreeHugger Robot
af8571f33e Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 am: 89d131727c am: db835221af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I5d834ada23cc33b85355d94275e32a4c0791af86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 16:29:23 +00:00
TreeHugger Robot
5626e65991 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 am: a1c18a04f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Icf2c8b9a451ca18d8dc6910a037ba153695ad4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 15:02:10 +00:00
TreeHugger Robot
db835221af Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 am: 89d131727c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: Id4746d7bc0d46e6294df04db54a92288a5b60016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 15:01:51 +00:00
TreeHugger Robot
a1c18a04f0 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I07358095922c4b054950bf81160fa569680989cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:31 +00:00
TreeHugger Robot
f5b2d6bf85 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 7446f16681 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I67c2a94cc52dabe6ceeba892a9f7d0bf9ca822ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:11 +00:00
TreeHugger Robot
89d131727c Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 5022535781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I7f2b9aaa1f03d0bb186021329c44553ff748243f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:11 +00:00
Treehugger Robot
2a4097b074 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf am: 6315a724f8 am: 8347125177 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I4c2aed48cd5bfab0ffbb95751f1625ec03d9308e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:16:08 +00:00
TreeHugger Robot
7446f16681 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I9b553601fe759d0593e7c7522c6bb036f6c0afc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:15:57 +00:00
TreeHugger Robot
5022535781 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I14897ac1fe5897d9ea26892e5edc7e03de1e8f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:14:10 +00:00
TreeHugger Robot
56e3f60dec Merge "Add the ripple effect to the highlight background" into tm-dev 2022-05-16 13:45:10 +00:00
Treehugger Robot
8347125177 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf am: 6315a724f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: Ieace3ca857cc2bdb5912b5d16ecb4344cef1ba80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 13:31:07 +00:00
Treehugger Robot
6315a724f8 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 am: c158467eaf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I2e8c76b3d7b93172af52f83292f4b26b49467e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 13:14:01 +00:00
Automerger Merge Worker
76fcaf0052 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3 am: 03c9d79940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: Ib714e89611e10b8416e9c5db95422fe778b63394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:39:55 +00:00
Treehugger Robot
c158467eaf Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc am: a312e1f404 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I585e48ec5b375f1bbd9734e423709c150c9a93d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:39:36 +00:00
Arc Wang
bf6d4704af Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 3975972483 am: 928a73c82b am: 70a1b477e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I293b5bfa6578b050f6cb4359f07e91172bdcbb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:39:20 +00:00
Treehugger Robot
a312e1f404 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I10970f3d2e7b8c916d2ef6231cb21d59fe6dcd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:01:29 +00:00
Automerger Merge Worker
03c9d79940 Merge "Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 8f8b11bce7" into tm-d1-dev-plus-aosp am: d66473c3a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

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