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
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
Candice Lo
b8206c85c9
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884
am: c96e19f819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I66795c6f016a705acdd20526b443e50f8f89cac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 02:57:51 +00:00
Candice Lo
470dbd6884
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev
2023-03-31 23:17:48 +00:00
TreeHugger Robot
8248c8506f
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
am: 7f278b5527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: I15550a1d82e80e11c313711851951c94329c25aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:56:42 +00:00
Darrell Shi
a86614db74
Hide timeout to user0 pref when switching blocked.
...
Do not show the "timeout to admin user" settings preference when user
switching is blocked on the current user, e.g. in demo mode.
Test: atest SettingsRoboTests:TimeoutToDockUserPreferenceControllerTest
Bug: 255277938
Change-Id: Ibd0944c69254000a453f477eb72a0ba5832e9793
2023-03-31 22:14:35 +00:00
Hao Dong
322df0454f
Show Class 3 consent screen in enrollment with strong face.
...
Test: atest FaceEnrollIntroductionTest
Bug: 271903097
Change-Id: I1959a82862790ff918571145b3651d164aa118b6
2023-03-31 20:11:44 +00:00
Aurélien Pomini
649c5082c6
Add contrast setting in dev options
...
See the attached video from b/266071578#comment2 to see how the setting
looks like.
Bug: 266071578
Test: atest ContrastDialogTest
Test: atest ContrastDialogControllerTest
Change-Id: Id9fc31a0562059814d4e342ea8095adc5b53d5f3
2023-03-31 19:35:08 +00:00
TreeHugger Robot
8ae1abecc1
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev
2023-03-31 18:48:29 +00:00
Candice Lo
d2c53a2085
Announce scaled value for font scaling seekbar in Talkback
...
1. Keeping state descriptions for the seekbar as an array in the
PreviewSizeSeekBarController when we would like to customize the
state description.
2. Setting the scaled value to be the state description for the font
scaling seekbar when there is a progress change to the seekbar.
Bug: 269212483
Test: manually - attach videos to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I8e9e3681a0174f454cac871ebf62d785962c7165
2023-03-31 17:38:14 +00:00
Treehugger Robot
6684c9b6fc
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
am: 486691ad26
am: e1bcb16bfb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I83ed2f2a8790d7245e81f365fe6aeebbde604522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 11:00:57 +00:00
Wilson Wu
7dc217f8f6
Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0
am: 4d91298836
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474
Change-Id: I6d5913765e265161918fc77b28b0da07ff128981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:59:57 +00:00
Treehugger Robot
486691ad26
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I94301fd7e273f781aa5029128d960f8b9fb1c2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:03:11 +00:00
Wilson Wu
ce7ad1f8a0
Merge "Fix wrong user in personal profile" into udc-dev
2023-03-31 09:56:56 +00:00
Treehugger Robot
06bca85c6a
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 09:34:23 +00:00
Hao Dong
f56b8bc2a4
Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205
am: 5b159df4f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938
Change-Id: I2d7a6be0e98921b7adbc99646b3ebd30764bdc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 06:01:03 +00:00
Hao Dong
9ff72e4205
Merge "Post-enroll settings screen shows class 3 strings" into udc-dev
2023-03-31 04:44:16 +00:00
Patty Huang
b79d64ee90
Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"
...
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
2023-03-31 12:43:14 +08:00
Hao Dong
b0ff672a7e
Post-enroll settings screen shows class 3 strings
...
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
2023-03-31 03:05:57 +00:00
TreeHugger Robot
3d473b86a4
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
am: f02d69dd4f
am: 17e504f6a8
am: 15343f6585
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ie8123290c29d6560ad10aa0da19573a2f28a5e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 01:00:59 +00:00
TreeHugger Robot
17e504f6a8
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
am: f02d69dd4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:39:38 +00:00
TreeHugger Robot
3b74f7a188
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
am: 64aa2889d1
am: 5d0b8031fd
am: 76932b5ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: Ic5000b6d94276c6306d20b4335389f9697f68ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:10:56 +00:00
TreeHugger Robot
93e48fba81
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
am: b3599ae3b6
am: d82f2eae5c
am: 8838d8639d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: Ifa3cb5a55134c0cf3cddd3390cd5b7884fb57e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:10:44 +00:00
TreeHugger Robot
73e2d7966e
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d
am: b33294a11d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252
Change-Id: I07f8ae6e4db1dd9ff8d939af794d2c77fa8b7f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:10:06 +00:00
TreeHugger Robot
c5e120ff80
Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18
am: a18d8913c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477
Change-Id: Idb9cf25d9c7cc484d9f1afb83bc416f075e291b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:09:18 +00:00
TreeHugger Robot
bf52934fe2
Merge "Remove unused listener" into udc-dev am: a99c64dfde
am: 9a0c0d7a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269
Change-Id: I3b627dc32e633776350f292c2bd1333bb96f894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:07:16 +00:00
TreeHugger Robot
f02d69dd4f
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:04:20 +00:00
TreeHugger Robot
5bde972e4e
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev
2023-03-30 19:08:44 +00:00
TreeHugger Robot
5d0b8031fd
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
am: 64aa2889d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I7a12612e6aef131353d1dfbe2c8f4dd86d7b5b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:28:36 +00:00
TreeHugger Robot
d82f2eae5c
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
am: b3599ae3b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: I3940fb8e1333d051d12ddb5001717d473bf89d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:18:01 +00:00
TreeHugger Robot
64aa2889d1
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I5565f72a9d96e5212b2db3b57d9978648596fba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:30:30 +00:00
TreeHugger Robot
b3599ae3b6
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: Ieb852ea9a7963f0407f7a78e38df0050085ffbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:30:11 +00:00
TreeHugger Robot
3d548d2f2d
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev
2023-03-30 15:01:42 +00:00
TreeHugger Robot
d79985af18
Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev
2023-03-30 12:39:25 +00:00
Zaiyue Xue
ff11b8e307
Exclude screen on time in battery usage page when the device is in charging.
...
Bug: 265751163
Fix: 265751163
Test: manual
Change-Id: I4ed71e1d6fad56a7cbfc9cd47ed4d791f45261ce
2023-03-30 20:23:33 +08:00
tom hsu
23359bc0e9
Unify Tick Preference from Physic keyboard and Regional preference
...
- Also change icon color from colorAccentPrimaryVarient to colorAccentPrimary
Bug: b/272398108
Bug: b/264476709
Test: Manual test.
Change-Id: Ide602c6fb9501b832df646692ec618be8a76e7b9
2023-03-30 18:52:23 +08:00
TreeHugger Robot
a99c64dfde
Merge "Remove unused listener" into udc-dev
2023-03-30 09:12:48 +00:00
Wesley Wang
7effe64c18
Remove unused listener
...
- Remove OnMainSwitchChangeListener and it's interface since the
callback will duplicate with setCheck() method, cause the toggle on
event come with twice while on and off, in futher to casue some
duplicate work or error metrics logging
Bug: 218405966
Test: make SettingsRoboTests
Change-Id: If20ed6488d21443b9c623e8fe4de383a84ea673a
2023-03-30 12:14:05 +08:00
Roshan Pius
3ebfceafa6
settings(nfc): Remove reference to APM setting in NFC page
...
APM mode no longer affects NFC stack as of Android Q.
Bug: 275381319
Test: atest NfcEnablerTest NfcPreferenceControllerTest
Test: Manual settings page verification
Change-Id: I974a424332eb85e27d51816507183e1ca0def42c
2023-03-29 12:57:32 -07:00
TreeHugger Robot
b6399c95b3
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev
2023-03-29 19:52:27 +00:00
TreeHugger Robot
23c17977fb
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev
2023-03-29 19:51:37 +00:00
Weng Su
6e79778d3c
Restrict DataUsageList for guest user
...
- Don't show DataUsageList if the user is a guest
Bug: 262741858
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Id877c2235c6a65683f2d0a0ba381dffba4dd95b8
2023-03-29 21:44:55 +08:00
Weng Su
3abf4d9d5f
Restrict DataUsageSummary for guest user
...
- Don't show DataUsageSummary if the user is a guest
Bug: 262243574
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Change-Id: I94d0fd18a81dc0f0adba544340e648d58c5d3358
2023-03-29 18:12:44 +08:00
Zoey Chen
0e6e290fe2
Merge "[Settings] Remove the intent receiver due to the register exception" into udc-dev am: 082e8b03df
am: 70ce5538ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22305127
Change-Id: I6f941e184d52c41b27cc69588181bac6ec2e9270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 10:10:05 +00:00
Zoey Chen
082e8b03df
Merge "[Settings] Remove the intent receiver due to the register exception" into udc-dev
2023-03-29 09:39:33 +00:00
Wilson Wu
a7620427b5
Fix wrong user in personal profile
...
If the user is profile, it should use the current
user's profile parent to create the context instead
of always using the primary user(system user).
Bug: 264867495
Test: Manual test with work profile enabled, multi user flow, etc
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableVirtualKeyboardFragmentTest
Change-Id: I66d1462441359c40dda2a38c7534500791db9c83
2023-03-29 17:36:34 +08:00
Taran Singh
b90cccdc4f
Merge "[Settings] Make scribe setting default_on and secure" into udc-dev am: a6c79eb283
am: c62df024a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21677959
Change-Id: I2c87623d5d3286ff1f0969f2b3b06bfa7fd755ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 08:10:36 +00:00
Taran Singh
a6c79eb283
Merge "[Settings] Make scribe setting default_on and secure" into udc-dev
2023-03-29 07:28:33 +00:00