Stanley Wang
df81c450a9
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: a01cbf2774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: Ifd0c82f5b58d1633743db0381891e1ed6f0086bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:40:12 +00:00
Stanley Wang
a01cbf2774
Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767
Change-Id: I9cc73d08f88a2f12600d9ae805bb89873c7a59b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:21:00 +00:00
Stanley Wang
17365c8e47
Merge "Fixe the problem of invalid switch preference" into tm-dev
2022-04-27 07:00:10 +00:00
Automerger Merge Worker
d8bcd8b4b5
Merge "Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 3e1e0cd837" into tm-d1-dev-plus-aosp
2022-04-27 06:52:04 +00:00
TreeHugger Robot
3db1366221
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: I0ddd7a373275fe9be0eb3b008ce8f514bb376b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:52:01 +00:00
TreeHugger Robot
8b7a48a243
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 3e1e0cd837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Ibe6df22ad94f1c360e142eb6eb2573f5e29a98a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:52:01 +00:00
TreeHugger Robot
a715a3c7b9
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: I08aee9acbacc7d48ddb69c00f56d8111e1e34393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:20:28 +00:00
TreeHugger Robot
3e1e0cd837
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674
Change-Id: Ib9b86811540faf757fd85061934654b8a94fa36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:19:06 +00:00
TreeHugger Robot
c28169adb9
Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev
2022-04-27 05:56:10 +00:00
Hugh Chen
3aaf35cac1
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I5738e71927166b3f5d50cb3df235bde22a36caf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:44:25 +00:00
Hugh Chen
f42f401c1d
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: dcd868531f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I6d63cf33569e84ab04353020d37c92d291014926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:37:12 +00:00
Hugh Chen
07089739be
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I9650808a7a8d133a8dd306cb20a2bf03dad860c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:21:31 +00:00
Hugh Chen
dcd868531f
Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602
Change-Id: I392bc8403460c386d7938ce87f523a1187778c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:20:06 +00:00
Hugh Chen
ec5aa12cec
Merge "Fix NPE in Bluetooth Settings." into tm-dev
2022-04-27 04:00:33 +00:00
Joshua Mccloskey
5ba13f2c14
Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343
Change-Id: I43e4a9ee87f90fa25282cd6498cbc1dac5ce17bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 03:54:45 +00:00
TreeHugger Robot
4df4520afd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -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: Ib8bacd0548b88594bec1485a4b312c3144be6d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 03:51:41 +00:00
Bill Yi
afc0b47d1b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -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: I17da94794bbc6d9f0a2d14d34a5e599e25ed9371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 03:51:19 +00:00
TreeHugger Robot
4eef82d108
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 9c9dea5406 -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: I336a6a406817b58ac895644289f80c2690cf6d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 03:42:54 +00:00
Bill Yi
4112503af4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: 88e3db5ba2 -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: I70e53b6c9d53214814bc43f1fa46a9e6f1b0cf34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 03:42:41 +00:00
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
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
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: 3e8135ea741f6b29b35ae26c4e41ad0c2f84941f7146184316a344350db7
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
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
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
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
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
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
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
Bonian Chen
3bddc056d8
Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
...
This reverts commit aeac0619df
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
Bill Yi
1d14eb1b01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: cb6059d24d -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: Ibd90a8bfd83a4f3ab1b21311e9465ab25aae199b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:26:22 +00:00
Bill Yi
eb5995a968
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: 82c384c62d -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: I65708b422a112ca83c8317b10155dc5150d87157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:26:22 +00:00
Bill Yi
82c384c62d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -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: Ie1be6ac08814cb197fe6ccfe5c82a84e92cc0ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:10:39 +00:00
Bill Yi
cb6059d24d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -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: I28db6646b415272be6807778e135a7923d87e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:08:58 +00:00
Bill Yi
fa497ab8af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -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: I37b7ef953f06dedbfd1aae0f3c75ae9f3f86daa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:01:50 +00:00
