Bill Yi
9ee24ae348
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-28 00:36:49 +00:00
Xinyi Zhou
3438e20da1
Delete Fast Pair Settings
...
Fast Pair will not be launched in T.
Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Kweku Adams
d7189cc7ce
Make final factors configurable.
...
1. Add configuration support for the ongoing rewards (that are normally
less than 1 ARC).
2. Fix key/configuration of instant rewards
3. Fix UI string issue
Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Use UI to change factors. Check Settings via adb and TARE dumpsys
Change-Id: I571e188faa6915ea74826b725c9883a825ab152a
2022-04-27 17:57:01 +00:00
Bonian Chen
b5852f6685
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I01488a3ba0637820cccddaf245971110bb0ee6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:57 +00:00
Yuri Lin
48f463d840
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: Idbc80220c6bb562cb64211df806f48db2cf4c13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:48 +00:00
Bonian Chen
c406279030
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: If5d73a84e45719786462f0c178b0177035e332c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:39 +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
Bonian Chen
43cf210f90
Merge "[Settings] Fix flaky presubmit failure" into tm-dev
2022-04-27 16:23:09 +00:00
Yuri Lin
29c62e7873
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev
2022-04-27 16:08:55 +00:00
Bonian Chen
68981a3004
[Settings] Fix flaky presubmit failure
...
Bug: 229689535
Test: unit test
Change-Id: Iabea21aa5d7dd9e489b7b5839c8fcc32c9ba979c
2022-04-27 15:58:06 +00:00
Bonian Chen
b92156c03e
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev
2022-04-27 15:57:30 +00:00
Yuri Lin
646e9e4ff8
Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure
...
This is a global setting that is not per-user, so adjusting it accordingly.
Bug: 225373531
Test: manual
Change-Id: I100cd53a5ffef6ce5f9a01e6add9465a00ceaeb5
2022-04-27 14:31:20 +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
Alex Johnston
6509505975
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: I4642f01d20a5119ea91670f410c174640657a4ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:45:10 +00:00
Weng Su
37169b93d3
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: I401d6333fce88b91c424620db90cf079683d5cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 10:26:32 +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
Stanley Wang
10c9cf6cd5
Fixe the problem of invalid switch preference.
...
The source of this problem is that onBindViewHolder is called
after the user add the OnMainSwitchChangeListener. Then
preference gets a new MainSwitchBar in onBindViewHolder and
causes the listener to fail.
Bug: 223325900
Test: Manually test and observe the UI
Change-Id: I6e58c4cf035811bb8805e76bebb5fbb86c7a79da
2022-04-27 17:17:21 +08: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
Peter_Liang
fcce62aa77
Logging for the feature "Text and reading options" in Android T.
...
Logging for the status of five features “Font size”, “Display size”, “Bold Text”, “High contrast text”, and “Reset” in the “Display size and text” page.
Bug: 222661478
Test: manual test
Change-Id: I33060fca860e02ddac7716275e8682e70fbaff1f
2022-04-27 15:25:30 +08:00
Stanley Wang
07b4f09127
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: I3dc68b80553344a5535f3c34b3803280926a1d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 07:21:22 +00:00
Stanley Wang
17365c8e47
Merge "Fixe the problem of invalid switch preference" into tm-dev
2022-04-27 07:00:10 +00:00
Angela Wang
11dc02d115
Make the checkbox item large enough to click.
...
When checkbox display contents in a single line, the clickable area is
less than 48dp and making it hard to click. Setting the minimum height to 48dp can ensure the clickable area is large enough.
Bug: 226538268
Test: manual test
Change-Id: I341455bc98415bfe9292ff5ba4cf6c2153d487d7
2022-04-27 06:30:59 +00:00
TreeHugger Robot
85705f38d1
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: Iff69fc96ab9fc59b00ca8ef6ff2e4aac35e07dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 06:19:24 +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
Bonian Chen
8789731cde
Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"
...
This reverts commit 81d230b250
.
Reason for revert: merge failure in other branches
Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
2022-04-27 05:13:30 +00:00
Hugh Chen
681d69b2b9
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: I0d473f7d49bfec4cf179dc670b2c7e74d5e83bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 04:21:38 +00:00
Hugh Chen
ec5aa12cec
Merge "Fix NPE in Bluetooth Settings." into tm-dev
2022-04-27 04:00:33 +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
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
TreeHugger Robot
37c4a74b27
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-27 02:31:39 +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
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
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
Bonian Chen
4e32727c01
[Settings] Link to incorrect SIM after SIM swap
...
A click to the UI presented on screen should take user to the exact SIM
that clicked instead of the first SIM presented to the end user (and
could no longer available).
Bug: 227273792
Test: local
Change-Id: If5a33f72e5730911af61f20a6a45a40cafb956d0
2022-04-27 08:55:45 +08: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
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
.
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
Bill Yi
debd5bf4bb
[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: Ib5e9b875c232a845c528e3db6b0f3195b9153704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 23:16:32 +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
Yuri Lin
e540c8165d
Fix ZenModeScheduleRuleSettingsTest to test onAttach
...
this follows the model of the change to ZenModeEventRuleSettingsTest in ag/17607148
Fixes: 215062934
Test: settings robotests
Change-Id: I44abec9316f78be318b51ba541d20b863eb86c8d
2022-04-26 14:23:06 -04:00
Bonian Chen
065ca3dd2f
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: If544b902a3b32b60ffe52ad35ea23139442831bb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 11:35:04 +00:00