Prabal Singh
9a8f44227e
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev
2022-04-28 17:12:28 +00:00
Jan Tomljanovic
c15fb9ed81
Update the SafetyCenter icon
...
Test: manual
Bug: 230731934
Change-Id: I11a82348b77b5e162e9dfaf5bfa91642db709f6f
2022-04-28 17:09:05 +01:00
Chaohui Wang
ddedb31f6e
Fix flicker for Mobile data & Wi-Fi page
...
Both "Mobile data usage" & "Non-carrier data usage".
By,
1. Add header in onCreate() instead of onViewCreated()
2. Keep the space for Spinner, and preload initial cycles
3. Keep the space for 3 usage summaries
Bug: 191730864
Test: manual
Change-Id: I8c309c5f51ce6290383a2d10f75e41d0f207d61a
2022-04-28 23:00:57 +08:00
Prabal Singh
3e2d7f4581
Remove extra argument WorkPolicyUtil constructor
...
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
2022-04-28 15:21:18 +01:00
tom hsu
b899bd3690
[Panlingual] Avoid activity restart during rotation
...
Bug: 230680942
Test: local
Change-Id: Ib64509fb73fb363ad4dd5c2163659346295f581d
2022-04-28 21:32:33 +08:00
Edgar Wang
963f1a0051
Revert "Update data_usage_bytes_editor spinner background"
...
This reverts commit 18f8850521
.
Reason for revert: the sysmptom fixed in SettingsSpinner side now.
Test: visual verify on the latest build
Change-Id: I683172a72597deaeb40b8facb6bd0a6cce2b9231
2022-04-28 20:46:00 +08:00
Bonian Chen
f9be4c5a5c
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I5f9c37b458f185ac261f182ae290950c2d2fe856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 11:41:24 +00:00
Bonian Chen
783314ae4f
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev
2022-04-28 11:05:42 +00:00
Calvin Pan
049aa73cb1
Add unit test for AppLocalePickerActivity
...
Bug: 223503670
Test: atest
Change-Id: I0e92be43d661dd3bff19c3274d1572ef1f4e9c46
2022-04-28 08:15:34 +00:00
PETER LIANG
acdb3b8a60
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:51:22 +00:00
PETER LIANG
27aa5f9d94
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev
2022-04-28 06:45:11 +00:00
Kweku Adams
664e3805a7
Merge "Make final factors configurable." into tm-dev am: 3663986909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:35 +00:00
Stanley Wang
f781d8a02a
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I72be188119ae313ba3908dd9c10c1e5e99ce7ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:04 +00:00
Kweku Adams
3663986909
Merge "Make final factors configurable." into tm-dev
2022-04-28 02:59:29 +00:00
Stanley Wang
0e861f0993
Merge "Fixe the problem of invalid switch preference." into tm-dev
2022-04-28 02:59:20 +00:00
Xinyi Zhou
14c317a689
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Iefb16d41b1901b275f4a5019e78326de8d2e917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:53:51 +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
935706425d
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: I7837b1a347c978e0d952365de22e34352d38f65b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:48 +00:00
Yuri Lin
0e7619f290
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: Ia890b87537a3bc1d87c3d955a504ca5ad1a46857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:39 +00:00
Bonian Chen
f211a82f23
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: I227b64a070259d448cd3c7fe8f6256fcc137e7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:22 +00:00
Lais Andrade
e673e22181
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: I7f8ddde6995c2d124c9682ce65781900ca44b58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:11 +00:00
TreeHugger Robot
54467e3eb8
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: I58c7a9174a5b8892acf930554cfe8860e4194a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:41:18 +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
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
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
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
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
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
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
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
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
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
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
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