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
e1fa9effbc
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: I38ebb1bb199f6c9859d247a28c44ccb5868ccffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 18:48:38 +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
08345b579f
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: I6f6c054dfcfba7d81214c05ff241a58f559587e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 12:49:31 +00: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
6a8a92254b
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: Ie51260d644afe0017efc61089def6ba05b25087f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 10:18:26 +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
ef4ca344b8
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: I1f2c4cfbcf69d99f47c6f477b767f67fa7f4edbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 02:51:18 +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
a6a336c33d
[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: I28f8d97e0e998834588257dbd88636b1057bc64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 00:22:33 +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
822c670619
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: Ic63a596b372444ebb668a8e3e841e6d731c0e0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 19:10:54 +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
f162fec481
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: I78eb65ae3807b2933d6a609a1a330c22954fe9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 14:14:08 +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
a1f84e4906
[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: I6e8584cf20eb71df1db5bfcec07cb064b7c97106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:15:43 +00:00
Bill Yi
fde22b4e7d
[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: Ia11bef493b190c9d2cb5dd6ae3ef3414f6e519b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:15:41 +00:00
TreeHugger Robot
8d4d181089
[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: I88160c2609192564e985343ee1ec7e86b5b825c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:15:34 +00:00
Bill Yi
4d42f0330f
[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: I1af1cfac89157a27c457732c424ce8210005c003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:15:12 +00:00
TreeHugger Robot
57e18da4e8
[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: I148ff8bf2e4cbc99a8e5006de63176328cbce1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:14:48 +00:00
Bill Yi
139e48c6e1
[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: Ib5237742ebafa894903cceb86f46bc47d94e754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 08:14:26 +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
26c0aadb0d
[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: Ie7aa002f8f76d827a30eb0516c68ef209cc15357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:01:43 +00:00
TreeHugger Robot
7232cf4cc5
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: I001f2e9c1dbdbf32893bfea2026947cc5e40c191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:01:35 +00:00
Bill Yi
b030d1f75d
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: I2714fc8501f6d73f7bd9dde76fca7c0da0994530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:00:45 +00:00
Bill Yi
fe883b6e17
[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: Ia11a7606f2463c21b46419abe30c4d3d461b7c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 05:00:42 +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
TreeHugger Robot
d3dd46984a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-03 23:14:11 +00:00
TreeHugger Robot
f49808be95
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-03 23:14:11 +00:00
TreeHugger Robot
86e8a12fb3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-03 23:14:11 +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
3342f42150
[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: I925f5d7970474efd23de284baa6852c2448097f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:01:54 +00:00
Hao Dong
70f4d50b2f
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: Icd3ea8987a10c465c48a353a9baa47316518231b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:01:33 +00:00
Hao Dong
fc1fe263fe
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: If31c582f6f4cf02f41d7b100446412237f943772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:01:14 +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
8ea1c1ff59
[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: I46acaf77116925dbb4e91aada4187ba3e362a742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 21:02:03 +00:00