SongFerng Wang
803fe08dc5
Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev
2023-04-06 13:24:36 +00:00
TreeHugger Robot
cb00b2bd0c
Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev
2023-04-06 13:07:13 +00:00
TreeHugger Robot
56c16c247f
Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev
2023-04-06 13:05:52 +00:00
Zaiyue Xue
c616a65144
Fix b/276423111: Keep unchanged perferences in the app list instead of clear all.
...
Bug: 276423111
Bug: 269203672
Fix: 276423111
Fix: 269203672
Test: manual
Change-Id: Ie2cb668ae4c46f5c40eed555510be034be45d713
2023-04-06 19:54:40 +08:00
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
c01148716b
Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339508
Change-Id: If1d7df48930c24564e97826d27c2e6982a9d270e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 11:11:51 +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
4b13cfc0f8
Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72fae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339271
Change-Id: I1f3f0a388d985cc7a40e49940128196e1ff21a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 07:39:55 +00: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
9bbc2099ec
Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401
Change-Id: I6b53e58b678d864a40610115cd356dbe7074d03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 07:25:05 +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
9c39398d7a
[automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba
am: 2e82189b1a
-s ours am: b286a740ff
-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: I71fad690a350ce0372c63c00136d699a9980552f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 03:53:14 +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
e4c7e5b424
Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541
Change-Id: Ic9f27eb0e6eba63b719edcb31a0cc54909d4fd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 00:37:40 +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
Brian Lee
95178742b3
Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454
Change-Id: I58487aef2bc252448119e48c7a2f2bedc3a710b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 18:35:29 +00:00
TreeHugger Robot
f58610ebe7
Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556
Change-Id: Ifc78cbcbd8e4d3658a1dd028777b2103653304fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 17:59:46 +00:00
Vania Januar
1194f74dbd
Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124
Change-Id: I00c5fdfe6f32fe91badad161719a373ee7b59f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 17:56:46 +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
Lucas Dupin
99ddb6079c
Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568
Change-Id: I7e1fa01abd22b653ff1f1b1267c189cc09480100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 17:12:21 +00:00
Bill Yi
75102af90a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af
-s ours am: 1326cea122
-s ours am: ceb8476a1d
-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: I0f3c586495b0298346b73d007c2d3d1e71323ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 17:08:56 +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
f093db202e
Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732
Change-Id: I1e3041fc18c0316948e4eef7f163424ac508f629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 19:11:13 +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
59ebcc0930
Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev am: fccd16131b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252123
Change-Id: Ic8011c2641e6b62adae9e42e02a2d594ada53a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 14:11:51 +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
64b45862ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425019
Change-Id: Iaa4414a0110a83b6fa96e6cc652dacc6a69810ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:01:46 +00:00
Bill Yi
43b50d85be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425019
Change-Id: I6967c35789a27b9910309310587002f266143b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:01:42 +00:00
TreeHugger Robot
32ba3cfee5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425017
Change-Id: I8554cfe05eeddf2adc6a5702223086cc14da12e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:01:36 +00:00
Bill Yi
239d59a632
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425017
Change-Id: I79117c9a0032f882b4c0c3c941c56948961d7e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:01:07 +00:00
TreeHugger Robot
c87f9090cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425016
Change-Id: I545d60ca974e66a1f4cddf8c111dd8817e15d187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:00:45 +00:00