Commit Graph

89992 Commits

Author SHA1 Message Date
Gary Jian
7f809bda12 Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev 2021-11-17 01:34:29 +00:00
Kevin Chyn
156db33a56 Disable combined controller only if all modalities require consent
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.

Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest

Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
Makoto Onuki
baacfd7985 Use different exceptions for different crash reasons
Always throwing RemoteServiceException would make it impossible to
tell the cause of a crash without the string message.

Let's use a different exception type so developers can cluster crashes
without the exception message.

Bug: 124137635
Test: Treehugger
Change-Id: Ibae57bdb1b8965241c41249a89c728d224e4e995
2021-11-16 11:59:05 -08:00
Jason Chiu
a6cd1fee05 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev am: c144f7bb89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234663

Change-Id: I95ab4ae7fa4c8217d8dfef8ae1a07976681815ee
2021-11-16 07:40:47 +00:00
Jason Chiu
c144f7bb89 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev 2021-11-16 07:28:32 +00:00
TreeHugger Robot
24d2a7e110 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 18346ea63d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id262432f3b9e29c8a23a022b1867f3cb535da648
2021-11-16 07:15:15 +00:00
TreeHugger Robot
e8ef94d5b7 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: 5cd61aab24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id90bcdd0ff0e580322c49e49fca66d8e89fc4e6a
2021-11-16 07:14:58 +00:00
Bill Yi
35872d705c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 84ac5a3cc4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I31bb907641b260fa735e4a21f50bb0ae8ca3bcae
2021-11-16 07:14:55 +00:00
TreeHugger Robot
e1dcef06bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 0bbf5438d0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Ia42c8cea48ee57a1c273398ebfe63cfb7947082a
2021-11-16 07:13:36 +00:00
TreeHugger Robot
93c9001958 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: ed43498d71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I06561e4fe03390fae22c3027604ef93f1f020502
2021-11-16 07:13:06 +00:00
Bill Yi
0c6c527eac [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 1ab9266897 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I19f3c4824d9554bf1388496df85bc326c1884824
2021-11-16 07:13:05 +00:00
TreeHugger Robot
0bbf5438d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I356b281608f37db8d3683a20840bd274e4c5f26d
2021-11-16 06:57:13 +00:00
TreeHugger Robot
18346ea63d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Ia8202a8c93f6c61e9c46918b4a51c857d6de6369
2021-11-16 06:57:09 +00:00
TreeHugger Robot
ed43498d71 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id969ace896b3a93fc3b3f60a442b65fa445f2a2c
2021-11-16 06:56:52 +00:00
TreeHugger Robot
5cd61aab24 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I0f1fc30af470911b608ede9ddf9da71911d6e922
2021-11-16 06:56:50 +00:00
Bill Yi
1ab9266897 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: If64647c33ee377a6bd91099bc6fc81c33ecb9dba
2021-11-16 06:56:50 +00:00
Bill Yi
84ac5a3cc4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I2f3b09cf7200c7e1cbeca72ecfeff47575f08c49
2021-11-16 06:56:49 +00:00
TreeHugger Robot
868cb753cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I55e9911e89da1f596826b485f21db1b943a60b35
2021-11-16 06:56:46 +00:00
TreeHugger Robot
36ae9f88a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:45:14 +00:00
TreeHugger Robot
0bbc6e224f Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
2021-11-16 06:45:14 +00:00
Gary Jian
68b861930a Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
2021-11-16 04:40:08 +00:00
SongFerngWang
4d00bce2b2 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:38:22 +08:00
TreeHugger Robot
b9e7e27808 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev am: c0cca5c474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183660

Change-Id: Id40079bcd0dfc07725fd4a3fb5201cae93f6135a
2021-11-15 19:58:30 +00:00
TreeHugger Robot
c0cca5c474 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev 2021-11-15 19:46:19 +00:00
Bill Yi
a582a5892b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours am: c2cdc020d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353

Change-Id: I14c49baa21f1b7585c11a1f8a026870f2dea0f72
2021-11-15 17:34:51 +00:00
TreeHugger Robot
bf4586f728 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours am: b7cb455366 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483

Change-Id: Ia0b219abb8f55896f002301f9823a2350602837d
2021-11-15 17:33:43 +00:00
Bill Yi
7a7da305c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours am: 16e6040e59 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359

Change-Id: I8904ae5e0a218385cace3ca73c98412eca20aa35
2021-11-15 17:32:51 +00:00
Bill Yi
0cf8d470fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours am: ef0a786bd7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353

Change-Id: I0017c6a800c1c593aacff762c3c74c95df466f3a
2021-11-15 17:16:30 +00:00
Bill Yi
c2cdc020d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353

Change-Id: Ic5eed8d41e7b9311f91bcf841f01e379e4904f29
2021-11-15 17:16:23 +00:00
Bill Yi
ef0a786bd7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353

Change-Id: I3935762e457e5d6c71030127e6703232f8520282
2021-11-15 17:16:11 +00:00
TreeHugger Robot
6d9a1b8daa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours am: 30f96b0763 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483

Change-Id: Ic91167be820cbcebd249448c6509c9d58419dc3f
2021-11-15 17:16:05 +00:00
TreeHugger Robot
30f96b0763 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483

Change-Id: I3a812f29f75c27dc319fccea48251719fbae9877
2021-11-15 17:15:55 +00:00
TreeHugger Robot
b7cb455366 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483

Change-Id: Idd94029e31ce22b03f792016670a89110adf3981
2021-11-15 17:15:37 +00:00
Bill Yi
e749989be0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours am: a83466e2ad -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359

Change-Id: Ie98d232543ce409f2eb8f158fc7f51ce0820a28a
2021-11-15 17:15:32 +00:00
Bill Yi
a83466e2ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359

Change-Id: I10cf8ab0d3445f6c38b07f15e8d66a9e6d410cb7
2021-11-15 17:15:19 +00:00
Bill Yi
73bedcdd7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353

Change-Id: I2e8f62e50556e57371cddbcb7be02f75e0630cda
2021-11-15 17:15:08 +00:00
Bill Yi
16e6040e59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359

Change-Id: I75567b65694e64a0a3c663d2b7a59e63f63e0746
2021-11-15 17:15:02 +00:00
TreeHugger Robot
f370e49613 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bd557d2ddb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231360

Change-Id: I12023a27020b032ef09331011d257df7e3845130
2021-11-15 17:15:00 +00:00
TreeHugger Robot
8996d315ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 68eaace6c4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231598

Change-Id: I1907c38df5d05038a5bf7123e7d6dbb0e1650a5d
2021-11-15 17:14:00 +00:00
TreeHugger Robot
bd557d2ddb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-11-15 17:00:33 +00:00
TreeHugger Robot
db01149e40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-15 17:00:27 +00:00
TreeHugger Robot
68eaace6c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-11-15 16:59:20 +00:00
Jeremy Goldman
e2dce3ffab Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag" into sc-v2-dev am: 2d529a4f5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221118

Change-Id: Ib2a07498176d2f156d1f82f956b8af754c376ea8
2021-11-15 06:07:27 +00:00
Jeremy Goldman
2d529a4f5c Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag" into sc-v2-dev 2021-11-15 05:53:13 +00:00
SongFerngWang
13aadad7fa Device do network scan after user rotates NetworkSelection page
To avoid to do oncreate when device is rotated or the screenSize
changed. Adding the activity's android:configChanges as
"orientation|keyboard|keyboardHidden|screenSize|screenLayout
|smallestScreenSize". (Based on SettingsHomepageActivity's settings
and the smallestScreenSize is for screensize changed on
different display.)

Bug: 204039043
Test: atest AutoSelectPreferenceControllerTest (pass)
atest OpenNetworkSelectPagePreferenceControllerTest (pass)
atest NetworkSelectSettingsTest (pass)

Change-Id: I6aa009fc52a85024a29bf48a3e7d1aadcab067d8
2021-11-15 12:46:34 +08:00
Weng Su
eb70b243f7 Fix the CtsVerifier issue
- The "android.settings.WIFI_SETTINGS" intent-filter needs to be the
first element of the intent-filter in the activity for profile intent
filters

- Redirect the "android.settings.WIFI_SETTINGS" action to Internet
Settings via FRAGMENT_CLASS meta-data

- Add PRIMARY_PROFILE_CONTROLLED meta-data to WifiSettings2Activity

- Remove unnecessary WifiSettings2Activity from Settings.java

Bug: 205258444
Test: manual test
- Long press the Internet Tile in QS for WIFI_SETTINGS action testing
- Use adb command to test the shortcut action
adb shell am start com.android.settings/.Settings\\\$WifiSettings2Activity

Change-Id: I9ac397828edf1083efcf790eb41b3e978ed6bdca
2021-11-12 15:06:05 +00:00
Shaowei Shen
da06c920b9 Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I7b413717713090f236d5dcddd8978927dc4da02b
2021-11-12 09:32:16 +00:00
Shaowei Shen
2874b6442e Merge "[Sound panel] Use localized string for button text" into sc-v2-dev 2021-11-12 09:14:19 +00:00
Zoey Chen
2d5641f17b [Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size am: 6cf16b0aa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145006

Change-Id: Idea7f177ee4897c20bd7faf773a34e79976f2376
2021-11-12 08:43:51 +00:00
Zoey Chen
6cf16b0aa9 [Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size
2. register split rule for MobileNetworkActivity

Bug: 204508876
Test: manual
Change-Id: Iff3dae41293e79b274d2928cb51efea46fb45dd4
2021-11-12 15:22:43 +08:00