PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,560 Commits 1 Branch 0 Tags
46dda94691b7e8177f31ccedb65fba0e7d91a16c
Commit Graph

102560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
46dda94691 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: b0bf5dd13f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I7bf2cde21b48a7621044c9cfcb9b3c01231e7670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 13:43:17 +00:00
TreeHugger Robot
2a742b1774 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I6ff4801edb22824bf62b1674642695a516b0bb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 13:42:58 +00:00
TreeHugger Robot
aee4b8e3d4 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: I736374cee128700e24000f21fc4cbe64d2cc34f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 13:20:20 +00:00
TreeHugger Robot
b0bf5dd13f 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: I1c72f82bf7ceb1a13d7a14c3a0ab5ad48beee760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 13:18:56 +00:00
TreeHugger Robot
5395a4eb28 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev 2022-04-27 12:46:52 +00:00
Alex Johnston
447dae8143 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 56807e16f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I52077bae42bcbba32ebe7698e7384a5d40a42f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 10:49:21 +00:00
Alex Johnston
8f02d3da63 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: d45cab5850 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I8c94063066310b4195f27974d45a692dec55367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 10:48:35 +00:00
Weng Su
0f036c9a27 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: b53c4ddcec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: Iaae096ddf40a78e63b2b78ddef8d4214fbb8a27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 10:48:06 +00:00
Weng Su
977f9577a1 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

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

Change-Id: Ib3be129b788d2a02850ef0f29887063e3037600f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 10:46:56 +00:00
Alex Johnston
56807e16f5 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: Iab96cc0c488a9e3326735dc7fbe7570365e1235d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 10:44:45 +00:00
Weng Su
6428d536c6 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

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

Change-Id: I6d31a98f1a7b2ac727c28e9071d1bf9a1f437e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 10:26:31 +00:00
Alex Johnston
7828dda503 Merge "Fix USB tethering grey out behaviour" into tm-dev 2022-04-27 10:21:50 +00:00
Weng Su
b6629ab55b Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev 2022-04-27 09:33:26 +00:00
Sunny Shao
d790fa2800 Fix collapsing toolbar can't collapse problem 
- Use the NestedScrollView instead of ScrollView.

Fixes: 216276444
Test: manual test
Change-Id: I3872bcc2f165ba8cf55f1782aa76f59adde5d3aa
 2022-04-27 15:51:45 +08:00
Automerger Merge Worker
fa2ba5bc88 Merge "Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: a01cbf2774" into tm-d1-dev-plus-aosp 2022-04-27 07:40:15 +00:00
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
4ff1183209 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I95ed08b9518cba1a747185726115f6802e842f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 07:40:10 +00:00
Stanley Wang
6a58c2faf1 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: I0189eb7313984ec4989c6febde3b0e977ddb7ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 07:22:28 +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: 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
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