Commit Graph

101768 Commits

Author SHA1 Message Date
Yuri Ufimtsev
ba1b11800a Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4 am: f295baf541
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603

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

Change-Id: I15e64d86e0b880870d6c2b35aaf8899427cda9c3
2022-03-22 14:10:56 +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
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
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
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
e38c655bc0 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2 am: 209c747910
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

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

Change-Id: I8d74fa26160d3b621869c322a852be580766d746
2022-03-22 12:39:59 +00:00
Chaohui Wang
46d1fa4b82 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: If75b43150ced9d15d36e24fd3bb3c0b92338fa48
2022-03-22 12:25:25 +00:00
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
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
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
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
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
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
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
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
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