Eric Biggers
9e3afb97ca
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: I54f937fb29a9c16816911dc3e851b732e71b8c72
2022-03-22 18:32:34 +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
d106ae0f82
Merge "Remove EXTRA_KEY_TYPE intent data"
2022-03-22 17:37:33 +00:00
TreeHugger Robot
af18f6353c
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: I4f24c0f10032ef9d661e1ba1d555099f6bfe7e8d
2022-03-22 14:43:36 +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
d4165ec9e1
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: Ied8cb07c3ddd89a28e167c6eb18eaea534c6a250
2022-03-22 13:55:41 +00:00
Yuri Ufimtsev
b1469cce58
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: Ic2fe73e794f3f41708308762757270024e696a93
2022-03-22 13:55:33 +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
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
Minche Li
1fb55c056a
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: Id3aeecb00020ce42c14ce954279a79d270f25cd1
2022-03-22 09:44:45 +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
Wesley Wang
5367c602d2
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: I159db97f0953c9569592ea123c64e89baac87e1a
2022-03-22 07:05:37 +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
178869aad3
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: I81dff07999b1b4ce159aa8ea0de6d94d2b80a920
2022-03-22 06:32:08 +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
Chen Xu
dbe7baa084
Merge "Do not allow editing of mcc, mnc for carrier id APNs"
2022-03-22 05:34:21 +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
531c4516f5
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: I41aa12aecf6209ac9e01ddf923a9c47e4caa9da7
2022-03-21 18:02:11 +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
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
ae07bd78d0
Merge "Fix flicker for Device admin apps." into tm-dev am: e7b38f27a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252814
Change-Id: I64262a2b9e224a0f3a3b939ec15ab336eca57605
2022-03-21 13:12:59 +00:00
Chaohui Wang
e7b38f27a3
Merge "Fix flicker for Device admin apps." into tm-dev
2022-03-21 12:49:45 +00:00
Bonian Chen
ed98a76f2d
Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286347
Change-Id: I4084b5ac506dd82e9e222668f28e8e7e343cda8d
2022-03-21 09:34:31 +00:00
Bonian Chen
6b9a904500
Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev
2022-03-21 09:27:36 +00:00
Treehugger Robot
e7b6e48b89
Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
am: 7ccb003e9a
am: 2054adddf7
am: 31ae1b4623
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623
Change-Id: I3ee8af37931bdf8e42df150bac5bec8bc6be7c23
2022-03-21 08:58:56 +00:00
Treehugger Robot
31ae1b4623
Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
am: 7ccb003e9a
am: 2054adddf7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623
Change-Id: Ib1b246c7c8adc01c9130ffe0c1d68172d43fe375
2022-03-21 08:41:20 +00:00
Treehugger Robot
2054adddf7
Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
am: 7ccb003e9a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623
Change-Id: Icb64ffcf05c2fb20297a48f09ad09ecf7ca5468a
2022-03-21 08:29:16 +00:00
Tsung-Mao Fang
55331ac071
Merge "Clean up footer preference on battery saver page." into tm-dev am: 352c9dd86e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252810
Change-Id: I9df721afa0b4d94f4fa192b7c03597abe2daa0e5
2022-03-21 08:26:15 +00:00
Menghan Li
ac4047db6d
Merge "Migrate SuW new flag isMNStyle into Accessibility" into tm-dev am: 97a5a69070
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247847
Change-Id: Ic1c84d802445e598d4fda5742ce710de4ad26aec
2022-03-21 08:25:57 +00:00
Tsung-Mao Fang
352c9dd86e
Merge "Clean up footer preference on battery saver page." into tm-dev
2022-03-21 08:20:02 +00:00
Wesley Wang
b26d99ac77
Update battery saver schedule min trigger value
...
- Udpate the min value to 10%, also change related preference summary
and seekbar value
- Make battery saver main page's switch support first time trigger
warning
Bug: 207470943
Test: make RunSettingsRoboTests
Change-Id: I120b9a6784ed90eacccb09bb11f079f12679e95c
2022-03-21 16:13:34 +08:00
Menghan Li
97a5a69070
Merge "Migrate SuW new flag isMNStyle into Accessibility" into tm-dev
2022-03-21 08:06:33 +00:00
Treehugger Robot
3378f6e4da
Merge "Add LE audio hardware offload development option" am: 3c209b06c0
am: bcb4ee1e8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033
Change-Id: I4d509aab5b501b432bdd6789827945508c7468f0
2022-03-21 06:25:46 +00:00
Calvin Pan
1fd5f8ff5c
Add i18n team to localepicker OWNER
...
Change-Id: I5769d5040958b62d9f29f3a802bf06e10a40ea1d
2022-03-21 05:46:10 +00:00
Treehugger Robot
3c209b06c0
Merge "Add LE audio hardware offload development option"
2022-03-21 05:24:10 +00:00
Eric Biggers
1cc85062cf
Remove EXTRA_KEY_TYPE intent data
...
This intent data was only used by CryptKeeperSettings, which has been
removed. This is also one of the only remaining users of the
StorageManager.CRYPT_TYPE_* constants which were only ever intended to
be used with vold's Full Disk Encryption APIs, which have been removed.
Bug: 208476087
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
(No regressions seen; 2 tests fail both before and after.)
Change-Id: Id6e2c0f5ecc79f7372b29393e66ffbd66d52d7a2
2022-03-21 05:09:48 +00:00
Jenhou (Alan) Huang
e8ca43b239
Merge "DO NOT MERGE Add setting page for the Spatial audio" into tm-dev
2022-03-21 01:59:31 +00:00
Bonian Chen
fa18f4de06
Revert "[Settings] Resolves unsynced infomation between status bar and settings"
...
This reverts commit 4f3ac2fcbd
.
Reason for revert: Should be fixed by ag/15270340, and removing this one helps to avoid UI from shifting when user click on buttons within "Internet" settings UI (b/222805255).
Change-Id: I149f4beab329a6ba69434c6d923e1d6bc054b27d
2022-03-21 01:11:26 +00:00
Bonian Chen
8837fa3d3b
Merge "[Settings] Code refactor - NetworkModePreference"
2022-03-21 00:16:02 +00:00
Alan Huang
616b0925ac
DO NOT MERGE Add setting page for the Spatial audio
...
The Spatial audio settings page control the state for the phone speaker
and the wired headphones
Test: make RunSettingsRoboTests
Bug: 220811398
Change-Id: I49e3fab48186d09357a8481652bdccb4aa5d044a
2022-03-20 15:55:53 +00:00
Kholoud Mohamed
51043a1513
Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev
2022-03-19 06:30:10 +00:00
Bonian Chen
93ca7288cf
[Settings] Code refactor - NetworkModePreference
...
Code refactor for improving readibility.
Bug: 223461708
Test: unit test EnabledNetworkModePreferenceControllerTest
Change-Id: I3b3157cbc76f104d63062fda495a7391ecc18ada
2022-03-19 10:46:06 +08:00
TreeHugger Robot
beb1fdc345
Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529
Change-Id: Ie27bb45432f30b16e2045b87c89901eeda327b2a
2022-03-19 02:39:13 +00:00
TreeHugger Robot
70e2ed1b9d
Merge "Hide emergency setting from "Search settings"" into tm-dev
2022-03-19 02:22:59 +00:00
Treehugger Robot
9448fe3278
Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862
am: 0b28adfd8e
am: bbb9db4149
am: 4463829319
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626
Change-Id: Ia24ee9964b2f5eed87add34af4bdaa87b75ca708
2022-03-18 23:42:53 +00:00