Commit Graph

101170 Commits

Author SHA1 Message Date
Kweku Adams
45b3c9f280 Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: If6df2836e323f94f99c4fd1a629ff015253a11b2
2022-03-22 19:06:45 +00:00
Kweku Adams
81e1f511d7 Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I8fc365e90a44177b5f5dc25a9f8a9e513c36bb99
2022-03-22 19:06:38 +00:00
Kweku Adams
240e85be9f Merge "Fix inaccessible view issue." into tm-dev 2022-03-22 18:59:25 +00:00
Kweku Adams
32edc913a7 Merge "Make reward constants configurable." into tm-dev 2022-03-22 18:45:36 +00:00
Eric Biggers
b28d6c6c76 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Icc017c4f8cfeba0e0d5eabcbb592337bf296fbf0
2022-03-22 18:31:43 +00:00
Eric Biggers
98ac6a6c01 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I46e1ca934dff648e8730d445046fa3150913891b
2022-03-22 18:04:27 +00:00
Eric Biggers
b79a82260c Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
2022-03-22 17:47:03 +00:00
Eric Biggers
465363a312 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b
2022-03-22 17:46:14 +00:00
Eric Biggers
d106ae0f82 Merge "Remove EXTRA_KEY_TYPE intent data" 2022-03-22 17:37:33 +00:00
Kweku Adams
eee64f2f73 Fix inaccessible view issue.
When fully expanded, the last item in the ExpandableListView was half
off the screen, making it hard to see what the value was and update it.
Tweaking the layout to ensure the last item is properly visible.

Bug: 158300259
Bug: 189850067
Test: Visual inspection
Change-Id: Ifc60e220276db6ee6d4dea57957b0b52b1934dbe
2022-03-22 17:37:22 +00:00
Kweku Adams
10ef599170 Make reward constants configurable.
Make it possible to configure the instant and max values of all
supported actions. Ongoing rewards will be enabled later.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: Ia854f18820f3fe95b3b1448c5fa8411853859052
2022-03-22 17:37:07 +00:00
TreeHugger Robot
5f6672c459 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747

Change-Id: I8f887febbba78ad0e002322c846375dd5883eb65
2022-03-22 14:48:09 +00:00
TreeHugger Robot
285cfcda41 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev 2022-03-22 14:42:43 +00:00
Yuri Ufimtsev
f295baf541 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603

Change-Id: Ie8a10ade44a05142451df6fdccc8ac6262a66bd2
2022-03-22 13:55:38 +00:00
Yuri Ufimtsev
aa30c6c595 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: Ieb3dc8368db13a43d95c981d2602d182d7ccbf01
2022-03-22 13:55:02 +00:00
Yuri Ufimtsev
b39ab3e1c4 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev 2022-03-22 13:41:33 +00:00
Yuri Ufimtsev
7e7d3f898e Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev 2022-03-22 13:41:09 +00:00
Chaohui Wang
209c747910 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: I82eca0f59431a6fb16fb6909844fda7d78480fcf
2022-03-22 12:24:53 +00:00
PETER LIANG
bd67c07268 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 679e6a140e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312729

Change-Id: Iea6e169d4db4ba9bb2ad31d85388cc9978d60176
2022-03-22 12:24:24 +00:00
Chaohui Wang
9512dfd7a2 Merge "Fix SetupSkipDialogTest" into tm-dev 2022-03-22 12:11:04 +00:00
PETER LIANG
679e6a140e Merge "Polish and humanize the strings for the preview of mail content." into tm-dev 2022-03-22 12:08:19 +00:00
TreeHugger Robot
d34438c0d5 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: 5376e4bf59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17309763

Change-Id: Id54f1d3b24202f9993157cfa1c4d4eff2c53976b
2022-03-22 11:42:53 +00:00
TreeHugger Robot
5376e4bf59 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev 2022-03-22 11:20:55 +00:00
Yuri Ufimtsev
be98245015 Declare task affinity for entries that could be launched by SafetyCenter
Test: manual

Bug: 222676668
Change-Id: I44c2f0cee61ffd8f10284cda5a740a9e9d9ea7bb
2022-03-22 10:36:28 +00:00
TreeHugger Robot
42d1143b77 Merge "Update spatial audio strings" into tm-dev am: 46756fcb44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312726

Change-Id: I63fe2caebf66d76c2f52a1084bf85947245c2740
2022-03-22 10:12:45 +00:00
Chaohui Wang
8a651a499c Fix SetupSkipDialogTest
Fix: 201021329
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupSkipDialogTest"
Change-Id: Iba6c8a8345cea0c69aab95630be26bd5b7ce3691
2022-03-22 18:07:57 +08:00
TreeHugger Robot
46756fcb44 Merge "Update spatial audio strings" into tm-dev 2022-03-22 09:57:43 +00:00
Minche Li
d4858cefd3 Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev am: 41257fe00a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286343

Change-Id: I41a08d448612127502eb2449b4394644829f6a48
2022-03-22 09:44:26 +00:00
Yuri Ufimtsev
b2358c6cce Register Safety Center as SubSetting for two-pane mode
Test: manual

Bug: 225166059
Change-Id: I3e6e877154a2ec831ce5f72f0aa8ec67023f09dd
2022-03-22 08:54:16 +00:00
Minche Li
41257fe00a Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev 2022-03-22 08:54:12 +00:00
Peter_Liang
2d54d60ead Polish and humanize the strings for the preview of mail content.
Bug: 219163254
Test: manual test
Change-Id: I6138bab2640a184a5faeed83c9b30df8a7829da1
2022-03-22 16:47:55 +08:00
Menghan Li
166b88c3c7 Merge "Fix shortcut toggles content has been covered by Switch Access accessibility focus." into tm-dev am: 1a3bdbff77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247845

Change-Id: Ib30b37c0a7b71c7c6aa8c7d9bc1dca1daa360d32
2022-03-22 08:45:36 +00:00
Menghan Li
1a3bdbff77 Merge "Fix shortcut toggles content has been covered by Switch Access accessibility focus." into tm-dev 2022-03-22 08:34:44 +00:00
Wesley Wang
b839afb49c Merge "Update battery saver schedule min trigger value" into tm-dev am: 878dae3db0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252813

Change-Id: I74e07650e23ffb7f782b1b7ece856421b9626573
2022-03-22 07:05:57 +00:00
Wesley Wang
878dae3db0 Merge "Update battery saver schedule min trigger value" into tm-dev 2022-03-22 06:51:52 +00:00
Chen Xu
980b19b8f0 Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a am: 1b29155aa3 am: 3ec2593137
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: Ibb07c1ea83eb4b30883c859174dc4ffd7b143b3f
2022-03-22 06:32:21 +00:00
Chen Xu
3ec2593137 Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a am: 1b29155aa3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: Iee87b5751d6216e29f64bca1bd91c70cd14d8875
2022-03-22 06:17:13 +00:00
Chen Xu
1b29155aa3 Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: Ia5c57252e2c6eba348b5ad89e63c49cd03e8e9d3
2022-03-22 06:05:20 +00:00
Hugh Chen
d10effc102 Update spatial audio strings
Bug: 225982666
Test: build pass
Change-Id: I3882960f2807799945d8e57766ec2161f287f8f1
2022-03-22 05:57:06 +00:00
Chen Xu
27dbc6ed2a Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: I10a5f94e302ef87490c2d4daa327a2207698de48
2022-03-22 05:50:29 +00:00
Chen Xu
dbe7baa084 Merge "Do not allow editing of mcc, mnc for carrier id APNs" 2022-03-22 05:34:21 +00:00
Bonian Chen
fd6a5e3fa4 Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev am: bb44ceb407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286344

Change-Id: Ia862b4241f73dc0e4f8afb39d01277feb3db641d
2022-03-22 03:30:44 +00:00
Bonian Chen
7d6b56e866 Merge "[Settings] Avoid popup activity get bringup from recent history" into tm-dev am: 2a937b7f95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17259875

Change-Id: I7332e7af3053d1ee246c2e515e7206404665d930
2022-03-22 03:30:11 +00:00
Bonian Chen
bb44ceb407 Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev 2022-03-22 03:12:17 +00:00
Bonian Chen
2a937b7f95 Merge "[Settings] Avoid popup activity get bringup from recent history" into tm-dev 2022-03-22 03:11:31 +00:00
menghanli
2c21adcf59 Fix shortcut toggles content has been covered by Switch Access accessibility focus.
Root cause: The padding of ShortcutPreference root layout narrows the focus area.
Solution: Move the padding into child layout

Bug: 191108646
Test: Manual testing
Change-Id: Iba329c6351b7fc1ba4062946e36bea31ae093804
2022-03-22 03:02:52 +00:00
Arc Wang
61a733ad0f Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings
It failed with Resources$NotFoundException and it blocks
WindowManager extensions CTS tests, so ignore it at first.

Bug: 216630912
Test: atest com.android.settings.deviceinfo.PrivateVolumeForgetTest
Change-Id: Iec270535a73bcca5879d2792c181d853b4af7250
2022-03-22 02:24:36 +00:00
William Escande
75151b017b Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6 am: 8139455374 am: 18f403141b am: 372d74ba71
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623

Change-Id: I677cf55920a854bfcab5fd330cce076acedb08ca
2022-03-21 20:42:19 +00:00
Lais Andrade
b827221ed3 Make sure vibration previews in Settings apply latest intensities
Update the Settings app to enforce fresh settings are applied to preview
vibrations triggered after the intensity is updated.

Add preview haptics to main switch, only when touch feedback is enabled,
and to the "apply ramping ringer" toggle for consistency with the rest
of the screen, using ringtone intensity for preview.

Bug: 219693646
Bug: 219695212
Bug: 157533521
Test: manual
Change-Id: I872a75d6b00dffae943b0f403185a39047909884
2022-03-21 18:33:44 +00:00
William Escande
372d74ba71 Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6 am: 8139455374 am: 18f403141b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623

Change-Id: Idbb4df614a56b632a7883e51aae0d21b762c643f
2022-03-21 17:44:57 +00:00