PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,751 Commits 1 Branch 0 Tags
04f5262673145808769fc629fcb2ce0aa8c3952c
Commit Graph

101751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PETER LIANG
04f5262673 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: Idbfc8799acf7e9e22df3d9dc0b63467eb5d89135
 2022-03-22 12:25:15 +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
3e9c8b4aae Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: 5376e4bf59 am: d34438c0d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17309763

Change-Id: If4f7e0fd66495a86a9b3f2444af411df1bd549fb
 2022-03-22 11:57:20 +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
77c7fbc845 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: Iedd37ad8905a2418c455924a54a136956abf40a4
 2022-03-22 11:42:08 +00:00
TreeHugger Robot
5376e4bf59 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev 2022-03-22 11:20:55 +00:00
TreeHugger Robot
4008e29b19 Merge "Update spatial audio strings" into tm-dev am: 46756fcb44 am: 42d1143b77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312726

Change-Id: I62758ff816009be5be0de42eaba26477cb60279a
 2022-03-22 10:25:56 +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
TreeHugger Robot
5230f93ca8 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: Ie9f24e6b733f01bc7a91a7dd01e332751241fd4d
 2022-03-22 10:12:38 +00:00
TreeHugger Robot
46756fcb44 Merge "Update spatial audio strings" into tm-dev 2022-03-22 09:57:43 +00:00
Minche Li
81cdced1ad Merge "Hides the settings entry in Magnification Settings if window magnification feature is not supported" into tm-dev am: 41257fe00a am: d4858cefd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286343

Change-Id: I75b4466de2c24d281730fc0a43610d8c0faa9ff3
 2022-03-22 09:45:23 +00:00
Menghan Li
5b33e9a91b Merge "Fix shortcut toggles content has been covered by Switch Access accessibility focus." into tm-dev am: 1a3bdbff77 am: 166b88c3c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17247845

Change-Id: I2df465cfa3891ad0ebc5f1bc17b84d3f0a199ed3
 2022-03-22 09:45:05 +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
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
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
085f0f1ff0 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: I71dc970a2d21b11bea917a59b6b7951f060044c2
 2022-03-22 08:45:17 +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
9453e0f6eb Merge "Update battery saver schedule min trigger value" into tm-dev am: 878dae3db0 am: b839afb49c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252813

Change-Id: Id2af6a96c3ae3ef5dfef417b676c02ccb0b55936
 2022-03-22 07:20:29 +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
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
b4dca89636 Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a am: 1b29155aa3 am: 3ec2593137 am: 980b19b8f0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: Ic964375f9a72ccb5c0bab543484ca0a9fc8443cf
 2022-03-22 06:46:10 +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
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
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
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
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
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