PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,400 Commits 1 Branch 0 Tags
710c94e17a07e87e74b9e031e78ff47aaa663f81
Commit Graph

105400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
710c94e17a Merge changes from topic "am-505afd9430024806aa2c671aef3b93c5" into tm-qpr-dev-plus-aosp am: 192728f91e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038

Change-Id: I5f70c6d638aab1f8eea2eba02fee10cc3c59937d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:22:22 +00:00
TreeHugger Robot
78a59521cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 298cb3a25c -s ours am: 5671e6d081 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b71e7e0f9804c69960ad235eb8707389eb2ff79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:22:07 +00:00
TreeHugger Robot
39f3636b95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 615c81031b -s ours am: 02457d0e68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e4852fe4c64defbfd5361a57220b651e246244a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:14:06 +00:00
Bill Yi
b3f7982a7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: c2b193716b -s ours am: 9f8abb6e53 -s ours am: 025c03d6f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I925db092d058add5de31ecba3a5bd0ec9656d833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:13:50 +00:00
TreeHugger Robot
6319f3f08e Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: be39eb0ad1 am: 20a6096aae am: df8346c483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: I5a9a4fedfc9f43662e70b8f6fdf0872f50c3d008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:12:34 +00:00
TreeHugger Robot
dc0839c856 Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: daf63cf01e am: 0fe59d8923 am: 7b78ba43d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: I9d47e519df681a0cb38ca5721f7573a29a31a228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:12:27 +00:00
TreeHugger Robot
75ace75c4c Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: be39eb0ad1 am: dfd4ecad02 am: 3929ebd72d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: I93abb24088d5a53a8dadad3fd2d57539d7effcb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:12:17 +00:00
Automerger Merge Worker
7d16ba0e17 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours" into tm-d1-dev-plus-aosp am: a76378a81f -s ours am: 568ac16fd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50b66012381d285bb98753425758bb3fd32923e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:09:34 +00:00
Bill Yi
b0eae03407 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours am: eb5995a968 -s ours am: ee81bf15c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b97b5449c0d9383a3f834fbf70c890c85c24807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:09:12 +00:00
Automerger Merge Worker
a73b5018b0 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: cb6059d24d -s ours am: 1d14eb1b01 -s ours" into tm-qpr-dev-plus-aosp am: 6c462552d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42bb8d3c3529877a305a13164dc9a347de620ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:06:05 +00:00
Bill Yi
1314169d3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: cb6059d24d -s ours am: 1d14eb1b01 -s ours am: b236dc122f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7339c34fe8a59054221489e1ea5ce90de0c2ea86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:05:48 +00:00
Automerger Merge Worker
998cd94408 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours am: e482bd0e01 -s ours am: bcb09a4db2 -s ours" 2022-04-29 00:02:41 +00:00
Abel Tesfaye
3fb18c1505 Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master" 2022-04-29 00:02:36 +00:00
Bill Yi
1dfca8360a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -s ours am: e482bd0e01 -s ours am: bcb09a4db2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83c4e913f6cc5a8e8f2ee59997acee74bc744324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:00:35 +00:00
William Leshner
2950e7c84d Merge "Disable screen saver setting for non-system users." into tm-qpr-dev am: ed5ba9a647 am: e708b185e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871948

Change-Id: Iba3719c80fccd9b8b7a6e88c7ed5dc334804f52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:44 +00:00
Bonian Chen
17be1037ee Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: bad5635b38 am: 6baccf2f44 am: 2089e8add0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: Ie3b914514589ab3292e2c8ef5bf92b799d848054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:35 +00:00
Bonian Chen
3ae0cbaad4 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: e8619c8d08 am: 5b68b8eedd am: 6bb8c2cdd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I780d10c51847abbbe4d6c57cffb5595cbe03858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:28 +00:00
Bonian Chen
df82b11ff3 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: 1d1c2826c9 am: a3df120063 am: 3cf209a5ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: I1339eb05f8a1f9aaeccb268e470c752096720774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:20 +00:00
Bonian Chen
47e8527f6b Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: 6483721f20 am: d8bd42d6f3 am: 98875e52e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: Ic721a35a4e4b67826f466f4c6cbac491c3530269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:12 +00:00
Jason Hsu
ec231955bc Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: c0fb12cf7c am: 691b1ef4f0 am: ef96d03e48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: Ifb642bc91dc2f8ea80c2234f805f3179c109ae51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:05 +00:00
Jason Hsu
22c79c504a Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: 2fc065c351 am: cd187d8bed am: bd3c43b150 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: I800a0a2878273f5d01f3ee4f3f710c93f419752d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:58:57 +00:00
Bonian Chen
851c7377a8 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: bad5635b38 am: a28e63c502 am: ad45786342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: Ieaeff53e9d4e7bf1cfda1bdfe04f03071c33a7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:58:48 +00:00
Quang Luong
aa7a544c93 Merge "Use WifiEntry.getBandString() to show band for Frequency preference" 2022-04-28 20:29:40 +00:00
Alex Spradlin
626169306f Merge [Settings] Code refactor for combining TelephonyCallback with Lifecycle into tm-dev am: 3fc05a917e am: e8619c8d08 am: 13ae7a955c 
This is to unstick Automerger.

Bug: 230457013
Change-Id: If8bc472fbfe961daa48c64e37fe80a3cc0383bae
 2022-04-28 19:26:17 +00:00
Bill Yi
7222a67b5d Merge changes from topic "tc_change_35" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 12b3ef3439
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-28 00:36:48 +00:00
Lais Andrade
82a3146c23 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: c09c49fcf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I4a46a73c2901720829056efa3c5d70ad89fb1114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:15:40 +00:00
TreeHugger Robot
930315e23a Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: f468355b99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I172be05706cc279e66485496360403ebd6bec731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:12:21 +00:00
TreeHugger Robot
a5ffbc5862 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: 505a0b8798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I3cd7fc454d81ac28ebb997d9b02b43ffe5755201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:11:13 +00:00
Alex Johnston
8742f0bf9d Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 6509505975 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I3ff0a70e17e7366ec1c1b4c95400b5482d61ef85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:09:46 +00:00
Weng Su
ff3ced78f9 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 37169b93d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I398c19e8f68b32f47742c0c864ae57b69e30c426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:49:41 +00:00
Stanley Wang
211b4fa498 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 07b4f09127 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I2b12337792b23962198e3ecbcf7823a441ab8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:49:28 +00:00
TreeHugger Robot
0a4de94f81 [automerger skipped] Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 85705f38d1 -s ours 
am skip reason: skipped by user bonianchen

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

Change-Id: I57386b761ffbf62eee86d601f83c5fe59c9a59f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:49:14 +00:00
Hugh Chen
0c128aca74 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 681d69b2b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I72fc05a7068125f4c6b68ab27b3a1532ef5f61c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:50:51 +00:00
TreeHugger Robot
cd1904d9ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 5ffb8f9140 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I436cbf5fca6e2501887ce457969b8eefac2d1318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:44:27 +00:00
Bill Yi
168d5f1029 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ecb3697aec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7158f1ed670f3af6f6707a4991eb85dd42bee67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:44:10 +00:00
TreeHugger Robot
7d99d82233 Merge "MainClear: remove obsolete check for multi-volume FDE" 2022-04-27 18:42:32 +00:00
TreeHugger Robot
e8731b9422 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 584d9ef1f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I347d29c5dbd465567ba62e06f58715c58801c2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:40:45 +00:00
Bill Yi
6efb9966c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aaa5c995b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16041617955ee84b8bc4b5d5e4d799ba94ef9a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:40:29 +00:00
TreeHugger Robot
c3ad3d8276 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: d35e6c93ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1703187cb8781b73e95be142383b530b6b961a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:34:16 +00:00
Bill Yi
bb0ba936d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: 10a83a199a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87fa781d28a254ef5a6be80c98e37abd52b46572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:34:02 +00:00
TreeHugger Robot
b0b62f812b Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: c05c41717e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: Ie172ade12edeae024b1ad3eb90d72848be57837c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:32:53 +00:00
Bill Yi
97c746c76f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: debd5bf4bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ecc5adaf09e37dfe9a7e21142143e75004cb17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:29:25 +00:00
Bonian Chen
b3afc78e2d [automerger skipped] Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: 065ca3dd2f -s ours 
am skip reason: skipped by user bonianchen

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

Change-Id: I736b591ea94a7c46e334f73e63ff5650ab351aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:28:39 +00:00
Bonian Chen
9257c94546 [automerger skipped] Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: 0667c64841 -s ours 
am skip reason: skipped by user bonianchen

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

Change-Id: I69de781290c6e719236e68b7816fbf7f07084b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 17:54:26 +00:00
Lais Andrade
c09c49fcf2 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I107d9d6220d4102ee7d592cf2a4f2f307d881302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 16:42:28 +00:00
TreeHugger Robot
f468355b99 Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I74b59fa059f6c1cf93def1d90c1d46c7d8478596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 16:42:03 +00:00
Lais Andrade
9c8d1e94fb Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev 2022-04-27 13:54:13 +00:00
TreeHugger Robot
9fd4377ddb Merge "Make the checkbox item large enough to click." into tm-dev 2022-04-27 13:51:14 +00:00
TreeHugger Robot
505a0b8798 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: Ifc535fae02c81f86e3b278004b6e0d66fbc6fb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 13:19:14 +00:00
TreeHugger Robot
5395a4eb28 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev 2022-04-27 12:46:52 +00:00