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
Bill Yi
f8ba0356ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -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: I99104986c4bdb99b86a0432b611d45362a9698fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:00:28 +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
fa6c1c8efe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours am: 11d22a70ee -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: I4a80925e9ac4f040c2a75668d53d47b03f1a53dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:02:50 +00:00
TreeHugger Robot
8ae0f1a438
Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534
Change-Id: I6226027856c834061a62f9347deda319c1280277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:02:43 +00:00
Bill Yi
8421878086
Merge changes from topic "tc_change_23040307_27" into udc-dev am: 8234ea3375
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: I81eff80a8c87c2bfc37ad7d83d1550136d95d8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:01:55 +00:00
Bill Yi
1038149e58
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 am: eea2a19c9a -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: I6640dd3995bd9fbf90dcde87f65f8d21ec6332af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:01:52 +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
bdf1c0d0ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours am: 0fcfd96c98 -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: I2e0c56cb75cfe4d8eda03fd36ebddd641ebe193b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:55:39 +00:00
Hao Dong
0703f48ea6
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: Ic19fe7709084759ae0637b6a1981a05e7dd97541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:55:20 +00:00
Hao Dong
8aae584706
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930
Change-Id: Ib890de88266fea8aeee3b17038b2f55979799cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:53:07 +00:00
Bill Yi
d91a9e506a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425015
Change-Id: I54e56f9a7c86dde12ee71b7a89076927fdc60734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:28:24 +00: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
e63893afe7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I03fe90cde312eb69915aa8b08b4a25924220d836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:01:07 +00:00
Bill Yi
66ce27e9b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I08d84eb6884581d359beff119b4d3f574805ebe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:01:06 +00:00
Bill Yi
d32bfe69d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ibaffaac082919ddb7e00a3ba05ef0bb69cc9bfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:01:04 +00:00
Bill Yi
ebe838839b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I88683fa7841083cfdfe8a711d88c29264b8e5edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 20:59:37 +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