Commit Graph

121483 Commits

Author SHA1 Message Date
SongFerngWang
fd531d6a07 Unregister MobileNetworkRepository during onPause()
- Move MobileNetworkRepository unregistration from onDestory() to onPause() for corresponding to its registration by onResume.

Bug: 275456375
Test: built pass and verified in bug
Change-Id: I4cd2f23501485d4f3cfcf867cdb8d81e0385794a
2023-04-06 11:50:04 +00:00
TreeHugger Robot
7a1d2177d8 Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev 2023-04-06 10:49:32 +00:00
Jason Chiu
5d50556ce2 [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906

Bug: 277168213
Change-Id: I35125125776e350ae7fce5feac4a387868fac7af
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 10:21:27 +00:00
Wesley Wang
c01d92982d Add manual enabled battery saver reason (2/4)
Bug: 218405966
Test: make SettingsRoboTests
Change-Id: Ifd51cde5abbbd731c24bf677ca1c525ffd6993a3
2023-04-06 17:11:23 +08:00
TreeHugger Robot
b29aa72fae Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev 2023-04-06 07:31:30 +00:00
Daniel Huang
5f3e365c41 Merge "Handling multiple profiles for PK layout selection" into udc-dev 2023-04-06 06:52:18 +00:00
Milton Wu
4140b84881 [BiometricsV2] Fix 2nd touch not work for enroll
Use MessageDisplayController only when enroll reason is ENROLL_ENROLL
and R.bool.enrollment_message_display_controller_flag is true.
And always allocate a new MessageDisplayController for each new enroll
to avoid the possibility of events being ignored by
MessageDisplayController.

Bug: 275510856
Test: atest FingerprintEnrollProgressViewModelTest
Test: manually test sfps/udfps enrollment for biometricsV2
Change-Id: Ifc8b91916a3d76bed68dc523a90dc6ba422e3923
2023-04-06 13:18:41 +08:00
Jason Chiu
0f13f70655 Refine permission check process of 2-pane deep link
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 04:23:01 +00:00
Jason Chiu
b286a740ff [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: Ibd08062eda8fed1d32aeb7fb06faa907ae13ff7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 03:22:25 +00:00
Jason Chiu
2e82189b1a Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214366

Change-Id: Icba9b653141d016945a5f999e1f324473d6bd1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 02:51:54 +00:00
Jason Chiu
d0b0aeb2ba Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev 2023-04-06 02:24:16 +00:00
Jason Chiu
4f7205b2ea Refine permission check process of 2-pane deep link
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 02:22:45 +00:00
Bill Yi
a5ef604de7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibda77f75cc4865437dd8dc5f52260b62b9d6f00b
2023-04-05 18:05:09 -07:00
Bill Yi
37114bb2b0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4b1f4ec2b736b8123de1ee218b367083163d737e
2023-04-05 18:03:09 -07:00
danielwbhuang
2659074d02 Handling multiple profiles for PK layout selection
1. Use new @hide IMM#getEnabledInputMethodSubtypeListAsUser()
2. Use ProfileSelectFragment

Demo: https://screencast.googleplex.com/cast/NjMzNTA2NTA2NDczNDcyMHwxNTUyMjQ1ZS03YQ

Bug: 275106096
Test: manual
Change-Id: I51cfd16fc7162e2b24782017b9366b0aad36f915
2023-04-06 00:50:54 +00:00
TreeHugger Robot
b232ba29e6 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev 2023-04-06 00:01:47 +00:00
Ben Lin
72534295d3 Do isAvailable() checks when accessing AirplaneEnabler.
This instance is only initialized if isAvailable() returns true in the
first place, so we should check for it everytime we try to access it, or
else we will result in a NPE.

Bug: 271223463
Test: atest AirplaneModePreferenceControllerTest
Change-Id: I43d35b91c86517201c8ec4f458f8c0328a9fb768
2023-04-05 22:34:16 +00:00
Prabal Singh
a53a89d370 Add "for work" in work profile biometrics string
JUSTIFICATION: Around 8 users reporting this issue in b/271250248
RISK: This change is a cherrypick from a fix already made in Android U where no issue has been reported after a few months.
Bug: 271250248
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
(cherry picked from commit a9231555e4)
2023-04-05 17:16:22 +00:00
Brian Lee
2eb8ed2488 Add RemoteLockscreenValidationFragment to help retain remote lockscreen
validation state.

Currently, if ConfirmDeviceCredentialBaseFragment is ever re-created due
to orientation change, screen getting turned off, etc., relevant state
gets lost. This led to the old ConfirmDeviceCredentialBaseFragment
handling results which led to issues such as lockscreen not getting set.
By addiing a retained RemoteLockscreenValidationFragment,
we're able to update the new ConfirmDeviceCredentialBaseFragment
that will handle results. We can also retain other important state like
the device credential guess to be set after successful validation.

Some smaller changes include:
* If the activity is finished for any reason other than "Back" getting
  pressed, RESULT_FIRST_USER is returned instead of RESULT_CANCELED.
* CheckBox, "Forgot [LSKF]?" button, and EditText/LockPatternView
  gets disabled during validation.
* The above also stay disabled if ConfirmDeviceCredentialBaseFragment
  gets re-created and remote lockscreen validation is still in progress.

Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 274983372
Bug: 274991889
Bug: 274792310
Bug: 270395807

Change-Id: Ib6d47430e233a43e6985ab83abae45713c49771f
2023-04-05 16:35:25 +00:00
jasonwshsu
d3b3ed5e6d Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment
* AbstractPreferenceController now can implement OnActivityResultListener to receive callback from DashboardFragment#onActivityResult()

Bug: 270096758
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.dashboard.DashboardFragmentTest
Change-Id: Ib734287c6fe06fcdde3b2fe6ae9f4b778020b60b
2023-04-06 00:14:37 +08:00
TreeHugger Robot
be16edbe06 Merge "Update Security & Privacy top-level settings icon." into udc-dev 2023-04-05 12:05:44 +00:00
Vania Januar
a07ff94f83 Merge "Fix broken test for stylus button Settings." into udc-dev 2023-04-05 09:46:25 +00:00
Lucas Dupin
222a89acc1 Merge "Add contrast setting in dev options" into udc-dev 2023-04-05 02:08:14 +00:00
Bill Yi
ceb8476a1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac91a75f89dfacc717c722da6af189684e993247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 00:08:38 +00:00
Bill Yi
1326cea122 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibbda26cecd84afdd5938309bfa247528cf8a3e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 23:38:51 +00:00
Dmitry Dementyev
cd7123e071 Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev 2023-04-04 18:37:36 +00:00
Tyler Dewey
2d2ade388b Update Security & Privacy top-level settings icon.
Bug: 273538234
Test: manually verified new icon on phone
Change-Id: Ib1e3d4fea856a45b5db2d21335d999a163ad7a88
2023-04-04 15:57:49 +00:00
Vania Januar
fccd16131b Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev 2023-04-04 13:24:36 +00:00
Marcello Galhardo
bf1452afb2 Add Note Task Shortcut to Settings
Test: manual

Fixes: b/272757160

Change-Id: I9ce69aa674a774e9150d16718b9558bea7a5560e
2023-04-04 09:57:25 +00:00
TreeHugger Robot
a1b725232d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
TreeHugger Robot
d6609274e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
TreeHugger Robot
7a60ee7b96 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
Bill Yi
11d22a70ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a1c8d167c91a8b176abe094ea70b6d1d58156e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:56:48 +00:00
TreeHugger Robot
d25bd214ae Merge "Fix App battery usage crash" into udc-dev 2023-04-04 04:47:31 +00:00
Bill Yi
bc051a4860 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-04 04:33:23 +00:00
Bill Yi
8234ea3375 Merge changes from topic "tc_change_23040307_27" into udc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
  Import translations. DO NOT MERGE ANYWHERE
2023-04-04 04:33:23 +00:00
Quang Luong
d6d560ff6e Don't overwrite security params when editing saved config
WifiConfigController2 sets the security params of a saved config, which
may overwrite @hide fields like SecurityParams#mIsAddedByAutoUpgrade. To
prevent this, only set the security params for a new config, and use the
existing security params for existing configs.

Bug: 262312532
Test: atest WifiConfigController2Test
Change-Id: I9ef5eb8ce2b4208e1fad27bd68fc4f0fad7d1008
2023-04-04 00:55:13 +00:00
Bill Yi
fa4e2c72af Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia388647234a08b6a569c4fb853ae6702eba75927
2023-04-03 15:43:43 -07:00
Bill Yi
0fcfd96c98 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1926d30af3c09df9c8393eea049c7a2a675a8e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:27:53 +00:00
Hao Dong
5a2ba07f63 Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev 2023-04-03 21:14:37 +00:00
Hao Dong
637ae9d983 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev 2023-04-03 21:06:40 +00:00
Bill Yi
076cc4fc6c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I035cb268a83cfbdae6eca6c1c4b3f43306b5dc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 20:58:59 +00:00
Hao Dong
ee8252b56b Show a dialog preventing fingerprint enrollment in split mode.
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
fingerprint
Bug: 246247132

Change-Id: I12357d197f2ceda8c1f1f582cdecb20fd18e30f7
2023-04-03 18:02:22 +00:00
Chaohui Wang
ecd8ffb08b Fix App battery usage crash
userContext.getApplicationContext() returns null, which cause crash.

Use context instead to fix.

userContext was used to support multiple profiles, since the app's user
id is also passed to getAppBatteryUsageData(), userContext is not need.

Fix: 269545838
Fix: 275957358
Test: Manually check the battery usage is still correct if an app is
      installed on two profiles
Change-Id: I41a80e4c6edc338affb6eec0cf12da3c438cd7fd
2023-04-04 00:15:29 +09:00
Bill Yi
eea2a19c9a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
Blank merge reason: commit message contains skip directive

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

Change-Id: I9a8f41aeff3f2d7585d46e1618449b06eec732ff
2023-04-03 14:35:51 +00:00
Bill Yi
7d4a0514cf [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262
Blank merge reason: commit message contains skip directive

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

Change-Id: I11461a7dba648fbdd5a952aa6b1d2a2809058bc2
2023-04-03 14:35:31 +00:00
Chalard Jean
f5747ba857 Only admin users may change private DNS settings
Bug: 237289258
Test: manual
Change-Id: Ia2875fb8c628642daebc48fc6aec99aaf30e64be
2023-04-03 03:27:29 +00:00
Bill Yi
e29a9fb4ea Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2d9f04335f9d38e35c8bebd63d32c2eddf7f5661
2023-04-02 17:54:23 -07:00
Bill Yi
179fdda8d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9687e3f6e8e0adb69d87cedd36926f91f0fd732c
2023-04-02 17:52:31 -07:00
Bill Yi
f44c0bafd5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib25a02c4a90baad11c0f8febb39f677d38cddb78
2023-04-02 17:50:19 -07:00