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
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
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
Yi-Ling Chuang
a28770e459
Add visibility control for the UiBlocker
...
The existing UiBlocker mechanism doesn't support additional visibility
control. With that, controllers that want to control their own
visibility won't be able to use UiBlocker.
Fixes: 223340393
Test: robotest
Change-Id: I2df2eb1ce77e2c94bb271a8b68cc8c6004df5c70
2022-03-22 11:53:33 +08:00
Bonian Chen
f2b304e0d1
Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev am: bb44ceb407
am: fd6a5e3fa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286344
Change-Id: I7b930fb95a3af21058f9a53053f945dd7c228696
2022-03-22 03:52:46 +00:00
Bonian Chen
05839dd4bf
Merge "[Settings] Avoid popup activity get bringup from recent history" into tm-dev am: 2a937b7f95
am: 7d6b56e866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17259875
Change-Id: Ie601f0857a15f1aea4bb7303a6f2031a94dbb915
2022-03-22 03:52:24 +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
a533109b25
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: Ie9959d7526b5e41d7886fe546d0b34dd4fecac1c
2022-03-22 03:30:23 +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
e838d6fdcf
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: I3ccb50f02ecd2d507be303186df7cb2b134aafc6
2022-03-22 03:29:49 +00:00
Yanli Wan
9d6aabe1e2
Update financed device info strings
...
Bug: 225814149
Test: Manual
Change-Id: Iaf121b90f775befb2d89b0378c35b23e048f3649
2022-03-21 20:21:47 -07: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
Peter_Liang
caa28b6e1f
Fix that the user has no way of knowing if the reset was successful.
...
Goal:
Added the new confirm dialog into to warn users.
Bug: 220126995
Bug: 222419452
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest
Change-Id: Id6e3ebdd6e9990996a5a4f12d9d19e28d3d58a13
2022-03-22 11:03:26 +08: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
William Escande
a60240b722
Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6
am: 8139455374
am: 18f403141b
am: 372d74ba71
am: 75151b017b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623
Change-Id: I2666a6aea542ec9d76bad22e0db32536dd87612e
2022-03-21 21:08:47 +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
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
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
43293db4fc
Merge "Fix flicker for Device admin apps." into tm-dev am: e7b38f27a3
am: a15f748f4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252814
Change-Id: I3bd28dfc7d512ee2ab88d41d97371d8bfb73024f
2022-03-21 13:30:26 +00:00
Chaohui Wang
a15f748f4e
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: I91d098c2264da4d64fadd05b3c9e6db2b5c303f1
2022-03-21 13:13:24 +00: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
c383a15d1b
Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev am: 6b9a904500
am: 03d27a8f1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286347
Change-Id: I2d57128512ecfa6a38ac74c2d176bcd85ace42e2
2022-03-21 09:51:01 +00:00
Bonian Chen
03d27a8f1b
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: I0eee5b81671b29e6ced07b9d8b3c69e4bbe504b5
2022-03-21 09:34:55 +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
cdccedb20d
Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
am: 7ccb003e9a
am: 2054adddf7
am: 31ae1b4623
am: ab9220a13e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623
Change-Id: Ib336d4ca12d73b8ec784c79f1ee47c1ba77ac33a
2022-03-21 09:16:51 +00:00
Treehugger Robot
ab9220a13e
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: I53bb510a7a4f06a9567a7a8ef206aad5abb9afc8
2022-03-21 09:00: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
Tsung-Mao Fang
d09bb273cc
Merge "Clean up footer preference on battery saver page." into tm-dev am: 352c9dd86e
am: 16a220c664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252810
Change-Id: Iffac9a72f2c2b2515097f45044cd1fd87036a338
2022-03-21 08:43:57 +00:00
Menghan Li
8dd90b7596
Merge "Migrate SuW new flag isMNStyle into Accessibility" into tm-dev am: 97a5a69070
am: d03ea81c4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247847
Change-Id: Id226effb957606e09140cc0c6da1fb98276a721c
2022-03-21 08:43:48 +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
16a220c664
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: I3ec920f9f7b3016e8f4044a99615af4e0e85bfda
2022-03-21 08:28:39 +00:00
Menghan Li
d03ea81c4b
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: I3ef7efdd97906c2f1448809224b91a3b1b15a3cb
2022-03-21 08:28:25 +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