Sunny Shao
076ed573eb
Revert^2 "Nullability Annotations replacement"
...
This reverts commit 19d1d3d15d
.
Reason for revert: revert it because this is not the root cause.
bug: 316867690
Change-Id: I0f168dbb64044aa720202af7b1040afd4f028c9c
2024-01-10 07:34:01 +00:00
Sunny Shao
19d1d3d15d
Revert "Nullability Annotations replacement"
...
This reverts commit cf0501e4d7
.
Reason for revert: b/317462033, it seems a flaky but revert it first.
Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
2023-12-29 02:28:24 +00:00
sunnyshao
cf0501e4d7
Nullability Annotations replacement
...
-- Replace the android.annotation.Nullable / android.annotation.NonNull
with androidx.annotation.Nullable / androidx.annotation.NonNull
Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
2023-12-20 08:50:09 +08:00
Mark Kim
6ca4c0fb5a
Merge "Update archive's button enable
property whenever hibernation toggle has changed its value" into main
2023-12-19 21:55:56 +00:00
josephpv
0b7d46746c
Add Biometrics settings inside private space One Lock settings
...
This includes below changes:
- Add Biometrics preferernce in Private Space One Lock settings page
- Face and Fingerprint enrolment for Private profile
- Feature is behind flag android.multiuser.enable_biometrics_to_unlock_private_space
Screenshots:
go/ss/9cWZRAuvGGW7gMm.png
go/ss/B3NoFbL3KbpSzeN.png
go/ss/7xH3DLi9d6Lu2mR.png
go/ss/8WBEgKychWpduXg.png
go/ss/8pmPGshd9aiPvVC.png
go/ss/AFPBPbiaBBvTj3p.png
go/ss/3fE4XKLLUdP8LmF.png
Bug: 308862923
Test: atest CombinedBiometricStatusUtilsTest, atest FaceFingerprintUnlockControllerTest
Change-Id: I1853107a4df4fc97db53c97524c6d44a4f554e37
2023-12-19 18:57:10 +00:00
Joseph Vincent
a123021e1d
Merge "Finish PS sub-settings page if PS is locked" into main
2023-12-19 18:14:53 +00:00
Shaowei Shen
d564f0b6de
Merge "[PK Setting] Refine layout for Keyboard review" into main
2023-12-19 15:59:01 +00:00
Mark Kim
5528e94455
Update archive's button enable
property whenever hibernation toggle
...
has changed its value
Test: AppArchiveButtonTest
Bug: 304257274
Change-Id: I95b8a2219a7d04437b5c7d217a520e8c8b05d395
2023-12-19 14:11:16 +00:00
Joseph Vincent
61fa50254e
Merge "Update strings in PS entrypoint summary and auto advance screen" into main
2023-12-19 12:52:35 +00:00
josephpv
4c055dd097
Finish PS sub-settings page if PS is locked
...
Bug: 317026141
Test: Manual
Change-Id: If3a3045c40dd61779b272589231d395ce7ae9fa9
2023-12-19 11:32:11 +00:00
josephpv
25ce6462c9
Update strings in PS entrypoint summary and auto advance screen
...
go/ss/B6UTjGhqwJkwGan.png
go/ss/7vniU5Q5Vz3ZEEx.png
Bug: 311343086, 316839546
Test: Verifed updated strings are shown
Change-Id: I7b1cf54f52c0e4a1480ed95924ee28e05a2fdaf3
2023-12-19 11:01:41 +00:00
Joseph Vincent
65ae0d8219
Merge "Show customized message for private space while choosing lock" into main
2023-12-19 10:37:05 +00:00
shaoweishen
5446813ac5
[PK Setting] Refine layout for Keyboard review
...
1. add background for keyboard review
2. add text for showing selected keyboard's name
Test: Verified on device
Bug: 305588594
Change-Id: Icf0f2b7798cc5cbddefc1b3a95480b48271b276f
2023-12-19 09:41:17 +00:00
Jun Lan
ac90fd15c7
Merge "Fix work profile apps are in Uninstalled" into main
2023-12-19 09:22:26 +00:00
Chaohui Wang
83c46eb1b6
Fix DataUsageListTest
...
Using androidx.fragment.app.testing.launchFragment to rewrite the test.
Bug: 315449973
Test: manual - on DataUsageList
Test: unit test
Change-Id: Ief373becb4ac8ab1ba93b8ff3c594b5682c4821e
2023-12-19 12:54:31 +08:00
Vincent Wang
40f6264056
Merge "Add talkback feedback when setting passowrd/pin/pattern complete" into main
2023-12-19 02:40:43 +00:00
Milton Wu
08ac06313b
Merge "Apply nosensor for face unlock enroll activities" into main
2023-12-19 02:34:27 +00:00
Treehugger Robot
cb1650c405
Merge "Prevent NetworkRequestDialogActivity recreation on some configuration change" into main
2023-12-18 23:46:43 +00:00
Matías Hernández
c76c679f63
Merge "Tag Zen operations from Settings as coming from the user" into main
2023-12-18 22:57:58 +00:00
josephpv
223737e0b5
Show customized message for private space while choosing lock
...
The change adds private profile checks in addition to the exisiting
managed profile check to show customized message while choosing lock for
private profile in Pattern, PIN and Password screens.
Bug: 311343571
Test: Verify lock screen message for private space
Change-Id: Ic8173ff8c1af23fc593390acaff4c67390f99b9c
2023-12-18 19:34:29 +00:00
Treehugger Robot
bb49d847a2
Merge "Log start of sign in flow" into main
2023-12-18 19:12:27 +00:00
Joseph Vincent
ad8dbc37d2
Merge "Calling requestQuietMode with peindingIntent to match PS settings with PS state" into main
2023-12-18 18:32:27 +00:00
Treehugger Robot
f5f4e0eebd
Merge "Block the disable option for WebView Default package" into main
2023-12-18 15:59:38 +00:00
Chaohui Wang
fb72154a8e
Merge "Prevent crash on SIM Lock settings while rotating" into main
2023-12-18 14:43:30 +00:00
Anna Bauza
0d64b9831a
Merge "Integrating new Avatar Picker App in Settings" into main
2023-12-18 14:18:41 +00:00
josephpv
16c32a5e2c
Calling requestQuietMode with peindingIntent to match PS settings with
...
PS state
Bug: 314910049, 312399293
Test: Manually verified
Change-Id: Iebdd09d4c6f319d50b8c0f118de0ddb2eaeb95d6
2023-12-18 14:16:11 +00:00
Jakob Schneider
5e8a4ab400
Merge "Add temporary system property checks in addition in addition to flag checks." into main
2023-12-18 13:27:15 +00:00
Matías Hernández
907b47105b
Tag Zen operations from Settings as coming from the user
...
Bug: 308670715
Test: atest ApprovalPreferenceControllerTest
Change-Id: Id118f867e84f3d742db6b12eab0f34df1357d178
2023-12-18 13:32:32 +01:00
Chaohui Wang
45fb655286
Prevent crash on SIM Lock settings while rotating
...
Prevent crash when getContext() returns null.
Fix: 316244109
Test: manual - rotating on SIM Lock settings
Change-Id: Iae17585cb52ea74e92129df2a1ced25454678d9a
2023-12-18 18:57:36 +08:00
Jun Lan
cd516c8d46
Fix work profile apps are in Uninstalled
...
Context: work profile apps needs to pass userId to packageManager to get the uid.
Fixed screenshot: https://screenshot.googleplex.com/AkXfMWvmREyQJvv
Bug: 315477872
Fix: 315477872
Test: manual
Change-Id: I96eb42ef6ce27f15415f0e1fc32060d69b3fab2d
2023-12-18 10:28:16 +00:00
Wu Ahan
1ab510bc3c
Merge "Update help animation per new spec" into main
2023-12-18 05:14:57 +00:00
Chaohui Wang
7429837eab
Merge "Use single queryDetailsForDevice if possible" into main
2023-12-18 04:44:43 +00:00
Joseph Vincent
acce4b46ae
Merge "Update footer strings in PS settings page" into main
2023-12-15 21:07:58 +00:00
Bill Yi
6caec2c78c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c700d05bb0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648720
Change-Id: Iac2aa3508d5edfdb88032f6607c3b66904dedd32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 20:02:04 +00:00
Bill Yi
acfeb82d3f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 063e533a49
-s ours am: 1dec72e3ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648511
Change-Id: I9280b20ad36b02b6a50e71041ebc736125ff9f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 19:24:21 +00:00
Bill Yi
ba23ac8a6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e9cfebc93
-s ours am: 23a484796f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648511
Change-Id: I46f7b08b5fd1cd418ac0fa611f5caf9206363957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 19:24:07 +00:00
Bill Yi
ba93770873
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2300cd1453
-s ours am: ba227a44b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25647469
Change-Id: I0d89eaecfa34e9202b26824d30e6a2a163fdeb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 19:23:47 +00:00
Bill Yi
1dec72e3ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 063e533a49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648511
Change-Id: I2d9085b2009c0f0d445a72055925637fdd12d90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 18:53:44 +00:00
Bill Yi
23a484796f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e9cfebc93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648511
Change-Id: I49ea01cbe49c14d11bc8269eddebb425e825ec21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 18:53:29 +00:00
Bill Yi
ba227a44b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2300cd1453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25647469
Change-Id: Ia0065653f0154b8d18d41e2e7ac53922377fb44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 18:53:13 +00:00
Treehugger Robot
1f05aa678c
Merge "Fix RTL issue on the edit a11y shortcuts screen." into main
2023-12-15 18:50:04 +00:00
Treehugger Robot
024574098c
Merge "Change to localization issue to increase character limit" into main
2023-12-15 18:46:49 +00:00
Bill Yi
063e533a49
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-15 18:18:42 +00:00
Chaohui Wang
51fc4bef49
Use single queryDetailsForDevice if possible
...
To improve performance.
Since queryDetailsForDevice() also aggregated the uids into one,
the apps list in DataUsageList still needs another separated api call.
Fix: 315449973
Test: manual - on DataUsageList page
Test: unit tests
Change-Id: I96c23dd7d0d40ecd183e0fb0f61329db42dae1ab
2023-12-16 02:01:22 +08:00
josephpv
2945295737
Update footer strings in PS settings page
...
Screenshot : go/ss/3txaYsyeRtLj8LJ.png
Bug: 316122890
Test: Manually verified updated strings are shown
Change-Id: I7c4b3ec04ddf95feae9976039fa1aa50bfdfabea
2023-12-15 17:34:43 +00:00
josephpv
46a11def1d
Change to localization issue to increase character limit
...
Increase char limit for private_space_lockscreen_title string
Bug: 311343571
Test: Manual
Change-Id: If52a4cd8d0e8e897dd38b37db516e00ff1905967
2023-12-15 17:17:04 +00:00
Joseph Vincent
0bdf8e9c1a
Merge "Add intent to start Private Space setup/settings" into main
2023-12-15 16:38:18 +00:00
Jason Hsu
cb9870b087
Merge "[HA Audio Output] Change category according to the audio definition" into main
2023-12-15 13:23:46 +00:00
Jakob Schneider
e06d787e2a
Add temporary system property checks in addition in addition to flag checks.
...
This was agreed on to enable dogfood testing on P9 without enabling the full
feature in QPR3. https://docs.google.com/document/d/1ZItkXfyKO2e235-EdisHASE6Dcl2hqATnieo6aJrsbY/edit?tab=t.0#bookmark=id.64wdrt989i3r
Test: manual
Bug: 315461548
Change-Id: I2ef71fd40d4afb83b9b73a977856e2912a5c87be
2023-12-15 13:23:10 +00:00
Manish Singh
132252da27
Merge "Don't show setting if private profile is locked" into main
2023-12-15 13:04:09 +00:00