Stanley Wang
031cda05c3
Fixe the problem of invalid switch preference
...
- SettingsMainSwithBar will be recreated after the page is resumed.
We should keep the OnMainSwitchChangeListener for
SettingsMainSwitchPreference and re-register the listeners after
the page is resumed.
Fix: 228930107
Fix: 222384287
Test: Manually test and see the UI
Change-Id: I9b57053989e611288cf4814b2a0ecbf9e3c55145
2022-04-27 03:41:06 +00:00
Joshua Mccloskey
dfc6bd1edb
Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev
2022-04-27 03:01:22 +00:00
TreeHugger Robot
4106452f17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27
-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: Idd6bfaba93e5a5e0e79046759e9b21f118cd1641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:56:15 +00:00
Bill Yi
ac0f2ae37e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff
-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: I3d774a5c9d3d9cd074e24f25699919a2e7c49029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:55:55 +00:00
TreeHugger Robot
9c9dea5406
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27
-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: I2a71ed5ef40a7abbe1761cb58724c67065a51070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:55:37 +00:00
TreeHugger Robot
5ffb8f9140
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27
-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: I877d8a9c3902b81bc5e0c94c4b87b038df6da1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:55:34 +00:00
Bill Yi
ecb3697aec
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff
-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: I3c21b3a8b4098bcb59693e95479b60ea2e7bce4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:55:15 +00:00
Bill Yi
88e3db5ba2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff
-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: I6c46ca3849c391c750828976413318d0237dab09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:55:07 +00:00
TreeHugger Robot
37c4a74b27
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-27 02:31:39 +00:00
Automerger Merge Worker
36900649d9
Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp am: 7bd6130a60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Iec7a25e05aa6323384a4c08c84166202584b346f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:18:21 +00:00
TreeHugger Robot
c3d19b2c67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours am: e26c4e41ad
-s ours am: 56424d355e
-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: Iad3f10d6e08fece4b9ecf193f7fcbc55ccc6ddcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:18:01 +00:00
Automerger Merge Worker
192728f91e
Merge changes from topic "am-505afd9430024806aa2c671aef3b93c5" into tm-qpr-dev-plus-aosp
...
* changes:
[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
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: c2b193716b
-s ours am: ed1263f024
-s ours
2022-04-27 02:15:49 +00:00
TreeHugger Robot
5671e6d081
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I1dffe2ade183fb96cb6abbedb5ebf3c38d25b090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:14:23 +00:00
Bill Yi
db435c6edd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: c2b193716b
-s ours am: ed1263f024
-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: Ibe20f181ce5ba5832eddc22f5a3f0e1a47becb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:14:08 +00:00
TreeHugger Robot
02457d0e68
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I4df73e966da12b4e33e246894c7b5ff5f5c5a109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:14:02 +00:00
Bill Yi
025c03d6f9
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Iba495da223180eef5b558ee49255f46ab46b8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 02:13:44 +00:00
Automerger Merge Worker
7bd6130a60
Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours am: e26c4e41ad
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: a344350db7
-s ours
2022-04-27 01:45:20 +00:00
TreeHugger Robot
56424d355e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours am: e26c4e41ad
-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: I21fbc4c4b19668b7d8129ff6ea053d49ee47e208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:44:07 +00:00
TreeHugger Robot
615c81031b
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I7e652e354e8e2a0b33ea134c34ebe40e663b4abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:44:04 +00:00
TreeHugger Robot
298cb3a25c
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I2868a1f8e746a3b2d1e59faa2680e014bf9bc9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:44:03 +00:00
Bill Yi
84cd101432
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: a344350db7
-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: I96c142e52b65fb74a7612c223144c08c920bc496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:43:51 +00:00
Bill Yi
ed1263f024
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: c2b193716b
-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: I05c10ecee893c1ecbb2daf3f87efb075b89306b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:43:47 +00:00
Bill Yi
9f8abb6e53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: c2b193716b
-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: Id02bef93154d022f94a157a265bfd571ee4d96dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:43:45 +00:00
TreeHugger Robot
584d9ef1f2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-27 01:30:16 +00:00
TreeHugger Robot
68baeb6c08
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-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: Ib725f85d75107fb77d15ca36dfdc6649b5b4fc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:21:53 +00:00
Bill Yi
c2b193716b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-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: Ifd94b87dafc48430f7abe71ac6aa67e457157e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:21:36 +00:00
TreeHugger Robot
d35e6c93ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-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: Idfef579ebaf88f95d7ef0cd3c2a4a84ee27f6e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:20:25 +00:00
Bill Yi
10a83a199a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-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: I209d2d286e04cd6ace075fe70a422c0576e9435f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:20:05 +00:00
TreeHugger Robot
e26c4e41ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-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: I50c8e8a036ba16be1de8ddd2f7933615a51ac94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:19:48 +00:00
Bill Yi
a344350db7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-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: I948f2dc9f4c7ffbd63bf0b56391192f221eddb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:19:33 +00:00
TreeHugger Robot
df8346c483
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: Ib101aa4c8e47b4fcbc3a00fc3f0f2636bea23680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:19:29 +00:00
TreeHugger Robot
7b78ba43d1
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: Ia4c64180470734be6d166ab58b4589f850f75c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:19:06 +00:00
TreeHugger Robot
3929ebd72d
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I8d9a525010599ba4bcd537ebdfc7f7fbead6d994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:18:48 +00:00
TreeHugger Robot
20a6096aae
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I6d4de5f561c4259fb9b49376687ece74501f600a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:03:20 +00:00
TreeHugger Robot
dfd4ecad02
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I50a6a6e575604dede9320f3544d948d77888dae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 01:03:18 +00:00
TreeHugger Robot
1f6b29b35a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-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: I4907deaeaf6cf14c6f22f8ee58036ca33e7782ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:59:23 +00:00
Bill Yi
7146184316
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-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: Id264da7161d5c6f04fcbc948596e8b2c376047f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:58:57 +00:00
TreeHugger Robot
0fe59d8923
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I275e6c3cc2149498d1f2fd0f88b95f99cf86ba38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:56:38 +00:00
TreeHugger Robot
be39eb0ad1
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I20de3cac557981cbf0ace509d1fcd51ee4244e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:41:33 +00:00
TreeHugger Robot
c05c41717e
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I4d667e09cdbc1fe420feab27817d09f63ee3591b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:40:34 +00:00
TreeHugger Robot
daf63cf01e
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: Ibcf50a295606d3e3b03dead22a1f4423cafb1e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:40:11 +00:00
TreeHugger Robot
3e8135ea74
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-27 00:39:28 +00:00
Automerger Merge Worker
568ac16fd7
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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I9d1309a5ba5ac832e196042c0e9efc908b38a9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:09:13 +00:00
Bill Yi
ee81bf15c4
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I4e66ff7704f68553458346e45d154ce42ea9811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:08:55 +00:00
Automerger Merge Worker
6c462552d0
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
2022-04-27 00:06:49 +00:00
Bill Yi
b236dc122f
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: Ie45fa813f73ed62ff671e6f9a164e471d63ed90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:05:43 +00:00
Bill Yi
bcb09a4db2
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: Iaef28a193e6bf1ef6101fc01ca2e64868ad9b323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:04:43 +00:00
Bonian Chen
3bddc056d8
Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
...
This reverts commit aeac0619df
.
Reason for revert: merge failure in other branches
Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2022-04-27 00:03:20 +00:00
TreeHugger Robot
a72b9398fb
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
2022-04-26 23:45:12 +00:00
Automerger Merge Worker
a76378a81f
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
2022-04-26 23:27:21 +00:00