Hao Dong
ba4746f0fe
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 90fc883217
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: Id9ca9553b0b6dc6d40df8b869f62cfc0b86ff0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 22:23:03 -08:00
Hao Dong
2688ddf907
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: Iefd9e1dd0a1558ab9b1c6af88f8905804b6cdb62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 21:58:09 -08:00
Hao Dong
90fc883217
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: Ie407bca1d30057b2f69330d22368d408ec3978ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 21:57:58 -08:00
Hao Dong
5b67d6e863
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev
2025-01-08 21:34:50 -08:00
Hao Dong
79baa3ff55
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: ccd03aaeb9
-s ours am: f401662091
-s ours am: 6760f95436
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29914910
Change-Id: I4fb7cc3c2fef131f4e5252653511cedfba5a207c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 21:22:07 -08:00
Hao Dong
a8e874ac82
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: d158b1675a
-s ours am: 6dc020526f
-s ours am: 86d2980fba
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29914910
Change-Id: I73dd895f441b43b0dffcb614589edf48c09f0bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 21:22:01 -08:00
Hao Dong
6760f95436
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: ccd03aaeb9
-s ours am: f401662091
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29914910
Change-Id: Ia0dbae6ff79ac2ef3c8884e3bb5a69d0efb966e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:34:40 -08:00
Hao Dong
86d2980fba
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: d158b1675a
-s ours am: 6dc020526f
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29914910
Change-Id: Ia4a2374ac3c53ccec984c33b033a73aa4eb10669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:34:37 -08:00
Joy Babafemi
3dea70443b
Merge "Update owners for account settings" into main am: aaa8896873
am: 70d953b3da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3441082
Change-Id: I75ed20ba97d788ba787f3064b5c4e8a822388aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:34:28 -08:00
Treehugger Robot
66f86d4612
Merge "[Catalyst] Move PreferenceCoordinate" into main
2025-01-08 20:34:18 -08:00
Yongshun Liu
14092d29b7
a11y: Add aconfig flag for magnification focus following dialog
...
Bug: b/388335649
Flag: com.android.settings.accessibility.enable_magnification_focus_following_dialog
Test: None, aconfig flag only
Change-Id: I93dded552bebdc97587a11caba284a461fb92282
2025-01-09 04:20:33 +00:00
Hao Dong
f401662091
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: ccd03aaeb9
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29914910
Change-Id: I89a740dd4e878a2678c87c48cc397825f96a378b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:07:02 -08:00
Hao Dong
6dc020526f
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: d158b1675a
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29914910
Change-Id: I8567eaa2465f9af1330ca8b3892be9d50cfb17e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:06:52 -08:00
Joy Babafemi
70d953b3da
Merge "Update owners for account settings" into main am: aaa8896873
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3441082
Change-Id: I59388fb599bf2f91dcdcafc828476274c37a1683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:06:39 -08:00
Hao Dong
ccd03aaeb9
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev
2025-01-08 19:43:18 -08:00
Hao Dong
fe69b57d4c
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: cf5d961564
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28785157
Bug: 388628639
Change-Id: Ic1813245fa86ad9e3c6f5e19741f63cc8cb51816
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 19:37:17 -08:00
Joy Babafemi
aaa8896873
Merge "Update owners for account settings" into main
2025-01-08 19:35:45 -08:00
Shawn Lin
10265d8d90
Merge "[Biometric Onboarding & Edu] Update Set up Face Unlock page" into main
2025-01-08 19:29:47 -08:00
Fan Wu
201d7ffac4
Check the permission of the callingUid instead of the calling package
...
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007 )
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
2025-01-08 18:58:41 -08:00
Fan Wu
63656485ea
Check the permission of the callingUid instead of the calling package
...
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007 )
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
2025-01-08 18:57:56 -08:00
Fan Wu
87645011fc
Check the permission of the callingUid instead of the calling package
...
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007 )
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
2025-01-08 18:57:33 -08:00
Fan Wu
353cfc1b08
Check the permission of the callingUid instead of the calling package
...
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007 )
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
2025-01-08 18:56:32 -08:00
Hao Dong
bb14931744
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: cf5d961564
am: 77c1c2dce7
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 e3e5aee5e9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28785157
Change-Id: Id5abde54f47fd9fe59b87edafdd8235461e15c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 18:43:30 -08:00
Hao Dong
77c1c2dce7
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: cf5d961564
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28785157
Change-Id: I1dbad13e3f039e18272579adaf249c37712bbf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 18:19:14 -08:00
Hao Dong
cf5d961564
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev
2025-01-08 17:38:41 -08:00
Ajay Dudani
12497cbb42
Merge "Update OWNER of tts settings" into main
2025-01-08 17:03:31 -08:00
Hao Dong
635f03b821
[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-qpr-dev am: c1b2d7c933
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 3d357eedb8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29859931
Change-Id: I20783773019fe671049d0dd510e56d56d1c59dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 16:55:56 -08:00
Hao Dong
496973d624
[automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: e3e5aee5e9
-s ours
...
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 3d357eedb8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29859931
Change-Id: I6eb8b386701ea0134b09be51ed7379707e0d8313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 16:55:50 -08:00
Hao Dong
c1b2d7c933
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-qpr-dev
2025-01-08 16:09:23 -08:00
Jacky Wang
a29db33025
[Catalyst] Move PreferenceCoordinate
...
Bug: 388420844
Flag: EXEMPT refactor
Test: N/A
Change-Id: Ieafb4ce4757e0935ffb276127a3e562a6ff0bcfa
2025-01-09 07:57:59 +08:00
Matthew DeVore
926f75ec5f
Merge "Use topology listener to detect changes" into main
2025-01-08 15:44:06 -08:00
Alyssa Ketpreechasawat
81d25980f8
Merge "Remove ModuleInfo#isHidden Usage from the source code." into main
2025-01-08 15:33:42 -08:00
Ajay Dudani
072d44c001
Update OWNER of tts settings
...
Update OWNER of tts settings to current on-device speech team members.
Flag: EXEMPT only changing OWNERS
Change-Id: I0ba6afb3e4a195deef05745ef6997886416446bc
2025-01-08 15:29:41 -08:00
Joy Babafemi
9c13abdc68
Update owners for account settings
...
Change-Id: I2fe4cf47509aa806e1dfbbd23cea690805c980fa
2025-01-08 14:50:11 -08:00
Rex Hoffman
3d508d0d12
Removing upstream flag as it is now the default.
...
Also moving to internal robolectric projects to no longer use the _upstream suffix.
Test: CI
Bug: 386652866
Change-Id: Ic4376619f01834a97ec10c33c283fd7cab45900f
2025-01-08 21:05:34 +00:00
Rex Hoffman
b47f76cb7c
Merge "Removing Dead Flag Test: CI Bug: 386652866" into main am: ccf197b366
am: 9b18787489
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434134
Change-Id: I93f2d70019643bb3b1b2d28a9dcf9108e9468ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 12:55:43 -08:00
Menghan Li
4cbdc3f598
fix(ReduceBrightColorsPreferenceController) Different feature configs
...
This change updates the tests for ReduceBrightColorsPreferenceController
to account for different combinations of feature flags and
configurations, specifically related to the "Even Dimmer" flag and the
availability of Reduce Bright Colors.
The updated tests ensure that the preference controller correctly
determines its availability based on these factors, improving test
coverage and reliability. This addresses inconsistencies between the
code and test cases, ensuring accurate behavior across various device
configurations.
Bug: 387071233
Test: atest ReduceBrightColorsPreferenceControllerTest
Flag: com.android.server.display.feature.flags.even_dimmer
Change-Id: Ie565ce996c7d4f49e194b119b32bf01a6508393e
2025-01-08 20:47:14 +00:00
Rex Hoffman
9b18787489
Merge "Removing Dead Flag Test: CI Bug: 386652866" into main am: ccf197b366
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434134
Change-Id: Ic4e6ff898dd4811bb41dd0b71a7d78b9b50fe1ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 12:31:12 -08:00
Rex Hoffman
ccf197b366
Merge "Removing Dead Flag Test: CI Bug: 386652866" into main
2025-01-08 12:17:27 -08:00
Lucas Silva
9c4dba40b4
Add posturing dream trigger to Settings UI
...
Adds ability for users to select posturing as the trigger for when
dreams will be shown.
Bug: 383208131
Test: locally - mp droid and verified posturing option is displayed in
Settings
Flag: android.service.dreams.allow_dream_when_postured
Change-Id: Iae69b9e488181b1e2af7474e3e9879a92b51274c
2025-01-08 14:59:58 -05:00
Weng Su
cd9af665c3
[Catalyst] Add back Wi-Fi switch metrics
...
- The original Wi-Fi switch metrics is recorded by WifiEnabler.
- Since the design of Catalyst removes WifiEnabler, the metrics needs to be added to Catalyst preference.
NO_IFTTT=Catalyst only
Bug: 388547699
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiSwitchPreferenceTest
Change-Id: I8819e8f660784b8b04c7958b65f4792b5d4d0919
2025-01-09 03:37:06 +08:00
Treehugger Robot
be203ea17d
Merge "Fix NPE on modes page when schedule has no days" into main
2025-01-08 11:17:09 -08:00
Matías Hernández
5098df9b6c
Fix NPE on modes page when schedule has no days
...
Fixes: 387088843
Test: atest ZenModeTriggerUpdatePreferenceControllerTest
Flag: EXEMPT trivial bugfix
Change-Id: I3b845784f5923521d7f3f6cae9d6d27a21f55361
2025-01-08 19:14:40 +01:00
Jiaming Liu
f4be314b3f
Merge "[AE] Enable AE Split for phones supporting display port" into main
2025-01-08 09:20:08 -08:00
Jason Chang
3e1e855094
Update Fingerprint adding button with expressive design
...
Flag: EXEMPT flag by System prop (SettingsThemeHelper.isExpressiveTheme)
Bug: 388260897
Test: build and manually check the UI and its behaviors.
Change-Id: I1c6d859f78305d0f14476e12a5bb4e1b0258d06e
2025-01-08 17:03:14 +00:00
Harry Cutts
fb0b459cf0
Touchpad: add @NonNull annotations to controller constructors
...
...and to some of the preference controller base classes, too, since I
had to work those out anyway.
Bug: 245989146
Test: m
Flag: EXEMPT unable to flag this kind of change
Change-Id: I32ba2b6b8c05c1379b4d921350050979b1866805
2025-01-08 16:36:43 +00:00
Harry Cutts
0e4edf9527
Touchpad: mark MetricsFeatureProviders final
...
(Fixing some warnings from Android Studio)
Bug: 245989146
Test: m
Flag: EXEMPT refactor
Change-Id: I3f473d281e8a22d108a52e56e6e53ca056e4a829
2025-01-08 16:33:35 +00:00
Harry Cutts
cc30711d59
Merge "Touchpad: replace references to "trackpad" with "touchpad"" into main
2025-01-08 07:39:51 -08:00
Treehugger Robot
e28dcd02bc
Merge "Fix sim status details not updated after sim hotswap" into main am: e9bc1949a9
am: 066efe6c55
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3431560
Change-Id: I176e94c9f718a14d5e4593471fadb1b1ef186dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 04:21:29 -08:00
Harry Cutts
ae3e005ff9
Touchpad: fix some NullAway warnings
...
Change I930e9fc85e09e03da3513e5f8443077fa8ea91b0 triggered some NullAway
warnings that are unrelated to the change, but some are trivial to fix,
for example by replacing member variables with local ones.
At the same time, add some `@NonNull` annotations to overriding methods
on Android Studio's recommendation.
Test: check touchpad gesture tutorial and pointer speed settings work
Test: $ atest SettingsRoboTests:com.android.settings.inputmethod
Bug: 245989146
Flag: EXEMPT refactor
Change-Id: I717eb2a2d68a46dce8ebaa95bef1183d09380f51
2025-01-08 11:53:14 +00:00