Gary Jian
e1356cdb64
Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9
am: 41ec2bc89b
am: 24888461da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223
Change-Id: I12e5aa6274b2db7f70a231d8b6512f40d32ff8a9
2022-03-23 06:56:17 +00:00
Gary Jian
24888461da
Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9
am: 41ec2bc89b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223
Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
2022-03-23 06:34:55 +00:00
Gary Jian
41ec2bc89b
Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223
Change-Id: Ia08609cddc63034e3f9d02f64727d92fe9e2348f
2022-03-23 06:11:41 +00:00
Gary Jian
78b2b241a9
Merge "Add a developer option to controll mockmodemservice permission"
2022-03-23 05:46:22 +00:00
Kevin Han
46adb8e175
Merge "Update hibernation toggle string" into tm-dev
2022-03-23 04:24:38 +00:00
SongFerng Wang
08e5d43e54
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
am: eefaf62ba7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I1a191387a358a40da753539284bba70d050a9bcd
2022-03-23 02:54:26 +00:00
SongFerng Wang
eefaf62ba7
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: Iabc7d3cf66470bd96c2b5caac2469eac888b2ae2
2022-03-23 02:34:07 +00:00
SongFerng Wang
285952a80e
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
2022-03-23 02:11:19 +00:00
SongFerng Wang
75869b5fef
Merge "[LE adudio] The condition of right location is wrong."
2022-03-23 01:52:05 +00:00
Kweku Adams
240e85be9f
Merge "Fix inaccessible view issue." into tm-dev
2022-03-22 18:59:25 +00:00
SongFerngWang
418d78f978
[LE adudio] The condition of right location is wrong.
...
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.
Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
2022-03-23 02:55:06 +08:00
Kweku Adams
32edc913a7
Merge "Make reward constants configurable." into tm-dev
2022-03-22 18:45:36 +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
285cfcda41
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev
2022-03-22 14:42:43 +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
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
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
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
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
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
878dae3db0
Merge "Update battery saver schedule min trigger value" into tm-dev
2022-03-22 06:51:52 +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
Gary Jian
5a535e6674
Add a developer option to controll mockmodemservice permission
...
Bug: 220995034
Test: 1.enable/disable from developer option and check the property value
2.atest MockModemPreferenceControllerTest
Change-Id: Iaa1a29f4214e1208fe4de497ff4b05c47c34b266
2022-03-22 12:02:52 +08: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
Kevin Han
188fe36c8d
Update hibernation toggle string
...
Update the toggle string in App Info to make it more clear that
notifications will stop for hibernating apps.
Bug: 201759939
Test: manual, check screenshots in bug
Change-Id: Ie7223ad7d92ae43fbb644b8d0a9f9c95309dbce0
2022-03-21 18:03:39 -07: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
William Escande
18f403141b
Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6
am: 8139455374
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623
Change-Id: Ia6a29c6c299aff76a4e1fc2ef58880e2ef76969c
2022-03-21 17:20:58 +00:00
William Escande
8139455374
Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623
Change-Id: I06b60f5208f839d42be064fd0ed9fbfc42c57a6e
2022-03-21 17:03:37 +00:00
William Escande
7c099faff6
Merge "API Review: factoryReset->clearBluetooth"
2022-03-21 16:56:32 +00:00
mincheli
57b35f9f35
Hides the settings entry in Magnification Settings if window magnification feature is not supported
...
If the device doesn't support window magnification featue, we
should hide the settings entry in mangification settings
Bug: 213414385
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I73f087da54cd2930c049dabb6b843c3b373e3c20
2022-03-21 22:48:34 +08:00
Chaohui Wang
e7b38f27a3
Merge "Fix flicker for Device admin apps." into tm-dev
2022-03-21 12:49:45 +00:00