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

108549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a0e9163384 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: 0dfd96e976 -s ours am: 9be6b5d107 -s ours am: 614f219655 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80d7a6e7ef0ed5af1d52cb0876391c3596045f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:52:45 +00:00
Bill Yi
bd758a91e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: ad24a2815a -s ours am: daae780b49 -s ours am: f29436d426 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d86678d13908ef96a61f504d27d46bc1e841b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:52:31 +00:00
TreeHugger Robot
33dce2f7a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours am: cc7d18bd75 -s ours am: 1dd5c06a0b -s ours am: 2a758498e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97b45b07da473cea547a95fc2a3bb73b3e68a6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:16:30 +00:00
Bill Yi
c7c140e7d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: d425079d95 -s ours am: 81edec4bda -s ours am: 5805ddda60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66b270a96b5c4dc90d83b7b568eb09d997dbbf71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:16:16 +00:00
Bill Yi
a3b0e3f826 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: 0f52443ebb -s ours am: 633d46e399 -s ours am: 7f7f4d6f38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idba13a3f8c376ed16d14bb5b9762d4d2360e9a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:16:00 +00:00
Bill Yi
614f219655 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: 0dfd96e976 -s ours am: 9be6b5d107 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e828fd5bdc166273b9260e51969c6adca77dc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:14:51 +00:00
Bill Yi
f29436d426 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: ad24a2815a -s ours am: daae780b49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42e39cf1765345e8243d1bf5c479008a993a5265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:14:36 +00:00
Bill Yi
9be6b5d107 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: 0dfd96e976 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib34c33ccf6de0893fd2ee3a46bd745212771d23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:01:48 +00:00
Bill Yi
daae780b49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: ad24a2815a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91898f7c0c708527bba92bda62e3a91f0fe1cd65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:01:32 +00:00
TreeHugger Robot
2a758498e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours am: cc7d18bd75 -s ours am: 1dd5c06a0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72a32d17882ab9bd903cc63ad6cb2ddbd18e383d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:37 +00:00
Bill Yi
5805ddda60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: d425079d95 -s ours am: 81edec4bda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic675ab9b1e6bbfe2888ab9d74bb06baf9a5d26c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:22 +00:00
Bill Yi
7f7f4d6f38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: 0f52443ebb -s ours am: 633d46e399 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ff17895f6b010cc835361adb7e6d140b0f24db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:58:05 +00:00
TreeHugger Robot
1dd5c06a0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours am: cc7d18bd75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I655b0105e8c8da4a3c2ca6669ecd46eb73a1679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:53 +00:00
Bill Yi
81edec4bda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: d425079d95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If993a97d2e77df725736eb3542f0ddb6921f8c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:38 +00:00
Bill Yi
633d46e399 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: 0f52443ebb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96925bc0e420f259b95363f8f3fc2969fbfb576d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:22 +00:00
Bill Yi
0dfd96e976 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35197080d628e6ef4bfeb3ae8535eb7e9dcfaeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:45:06 +00:00
Bill Yi
ad24a2815a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61cf06d1e8f06e3c018231e8d809068353f8c026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:44:48 +00:00
TreeHugger Robot
cc7d18bd75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie645e9ed2f3b8a84f63bd2f066ff3ccb3656950a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:32 +00:00
Bill Yi
d425079d95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I891e7c48b1750ae8ae3313c46c995fb80763ad1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:19 +00:00
Bill Yi
0f52443ebb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaae6f1a7be5ef43b552088d1506d367d1c94345d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:00 +00:00
Bill Yi
dacb214506 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80b7dc4eb1 -s ours am: 860d1ab731 -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: I29e22521b2aa9b58e0de1ec8271ffcd416ee8deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 17:47:33 +00:00
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
860d1ab731 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80b7dc4eb1 -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: I116c6c735a84b6a573378e69e076ee2a5e8e4937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 17:39:42 +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 Yi
80b7dc4eb1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-18 17:20:23 +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