Treehugger Robot
0c7896c4c8
Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5 am: 8f77a3bfb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412
Change-Id: I37d172d2e6aa6f988a891fa2e26112baa332e033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 11:30:45 +00:00
Treehugger Robot
8f77a3bfb4
Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412
Change-Id: I1b9b9ff95026831fec9329ccfefeb6096e984389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 10:46:42 +00:00
David Magno
4e816be889
Make Media Vibration setting configurable
...
Add a configuration boolean to control whether or not to display
Media Vibration switch (default: display the switch).
This configuration can then be overriden by OEMs for devices
that don't support media vibration.
Bug: 268657239
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.accessibility.MediaVibration"
Change-Id: I91857fbb04abc97b290559895010c3cbeef7ebab
2023-02-16 09:49:01 +01:00
Behnam Heydarshahi
3ee4929594
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549
Change-Id: If4cfdeb37dbcc49ce9ec36bee690df4db1a87213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 15:08:56 +00:00
Behnam Heydarshahi
d89de47399
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev
2023-02-15 14:28:15 +00:00
menghanli
af1f8ed6ad
Add a done button to vision setting pages in setup flow am: 991b70c720
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425
Change-Id: Ibb2f4831810685728481e6a9ba5073c3252b9968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 02:33:03 +00:00
Xin Li
65d9917e8a
RESTRICT AUTOMERGE - Merge TQ2A.230305.008
...
Bug: 264720040
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
Merged-In: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
Change-Id: I5833464626eb06a01d6979c477be98ba06827893
2023-02-14 16:31:37 -08:00
menghanli
991b70c720
Add a done button to vision setting pages in setup flow
...
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation. This change combines parts of commit 5e931b2c23 and commit dd2ec775c8 .
Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
Merged-In: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
(cherry picked from commit dd2ec775c8 )
2023-02-15 06:32:57 +08:00
Behnam Heydarshahi
236bbcb8bc
Propagate mute event to both ring volume slices
...
Fix a bug where introduction of a separate_ring_volume slice meant that
the original ring_volume slice would not get notified of ring stream
muting event.
Bug: b/266855922
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=VolumeSliceHelperTest RunSettingsRoboTests -j40
Change-Id: Ifb5ebe4e7d9bde3d14336891cce3fbee167a5911
2023-02-13 14:50:27 +00:00
Jakub Rotkiewicz
2a82a4f3b1
Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 am: bd2f353f8b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495
Change-Id: I948bc2e08e3044d20a9d3ce5b081c940bea54811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-13 14:19:30 +00:00
Jakub Rotkiewicz
bd2f353f8b
Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495
Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-13 13:35:37 +00:00
Jakub Rotkiewicz
cfde422f91
Merge "SnoopLogger: Debug enhancements added settings"
2023-02-13 13:01:01 +00:00
Jakub Rotkiewicz
5a1b8a11a6
SnoopLogger: Debug enhancements added settings
...
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4
Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
SongFerng Wang
327ae0d6db
Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev am: be84e27612
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21328340
Change-Id: I013418971db0db3a3e64895423063a88aac3c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-09 02:55:44 +00:00
SongFerngWang
e85bb5058d
Add a config to hide the 3G option at preferred network mode UI
...
Add a config config_display_network_mode_3g_option to hide the 3G
option at preferred network mode UI
Bug: 261615630
Test: build pass. local test pass.
atest EnabledNetworkModePreferenceControllerTest
Change-Id: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
(cherry picked from commit f7685dd715 )
Merged-In: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
2023-02-08 07:41:13 +00:00
TreeHugger Robot
e57000f2c4
Merge "Add animation for progress bar and lottie in fingerprint enrollment" into tm-qpr-dev am: a48f8944f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21145688
Change-Id: I69ac66e0a3d92a21c18f8980607d8b9c6571101e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-08 00:37:40 +00:00
TreeHugger Robot
a48f8944f9
Merge "Add animation for progress bar and lottie in fingerprint enrollment" into tm-qpr-dev
2023-02-07 23:53:42 +00:00
Diya Bera
7eb40da9c4
Add animation for progress bar and lottie in fingerprint enrollment
...
Test: Manual - While enrolling a fingerprint, onHelp will cause the
lottie and progress bar to shake
Bug: 266838595
Change-Id: I547d86182a87846aca7d025b35a008675f449e2e
Merged-in: I547d86182a87846aca7d025b35a008675f449e2e
2023-02-07 22:48:55 +00:00
Zoey Chen
245def5cad
[Settings] Add the CarrierNetworkChange case am: ba7418ecd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312559
Change-Id: Ie5927ffa717e26bc452c74f5ddb94f84720e9b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-07 13:31:29 +00:00
Zoey Chen
ba7418ecd7
[Settings] Add the CarrierNetworkChange case
...
Bug: 262927206
Test: atest SubscriptionsPreferenceControllerTest
Change-Id: If7eeb185224179d59ab841af0062ec5b98b956e9
Merged-In: If7eeb185224179d59ab841af0062ec5b98b956e9
2023-02-07 10:48:30 +00:00
Xin Li
c660135971
Merge TQ1A.230205.002
...
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Josh Hou
3f4d63b943
Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev am: 1739114d44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21052003
Change-Id: Iab6296f2dcdef8a25c0cb514bce478afcc70d67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:50:04 +00:00
Josh Hou
1739114d44
Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev
2023-02-02 00:15:12 +00:00
Diya Bera
4d67530e85
Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465
Change-Id: Ida39801c898a529725f3fc7484e8907a2591e348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 23:59:37 +00:00
Diya Bera
1021b58ae5
Tests for SUW in work mode
...
Bug: 247049655
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MultiBiometricEnrollHelperTest
Change-Id: Ifabb96a90c340bc9306cc0f033ba103c614f32a9
2023-02-01 22:05:09 +00:00
Josh Hou
5d7d1665fe
Fix the security vulnerability issue in AppLocalePickerActivity
...
Examine whether the packages is allowed to display app locales list when creating the AppLocalePickerActivity, and examine whether the target user is the same as the calling user.
Bug: 257954050
Test: Follows the test step listed in b/257954050#comment14
Change-Id: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
Merged-In: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
2023-02-01 15:42:22 +08:00
Behnam Heydarshahi
a61c636eab
DO NOT MERGE ANYWHERE
...
Revert "Read flag to show/hide notification slider"
Revert submission 20180104-flag_for_b38477228
Reason for revert: b/261809910 fixing for qpr2
Reverted changes: /q/submissionid:20180104-flag_for_b38477228
Change-Id: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
(cherry picked from commit b1195633da9d203056d29df8f119820425a33254)
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
2023-01-28 02:56:59 +00:00
Steve Elliott
2891e33edb
Merge "Setting to control seen notification filtering" into tm-qpr-dev am: c8a6db40ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022067
Change-Id: Ibb65634f4c0f6b45dc8a769d4a45c363c4c63522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-20 23:35:41 +00:00
Steve Elliott
f127bc13b0
Setting to control seen notification filtering
...
Test: manual
1. adb shell settings put secure \
lock_screen_show_only_unseen_notifications <0|1>
2. Settings > Notifications > General > Show only new notifications on
lock screen
3. Toggle setting
Observe: if setting is enabled, seen notifications are filtered from
the lockscreen, and vice versa
Bug: 254647461
Change-Id: I4f6e35a1d918095cea25a97f72ddd08869ad9b31
2023-01-19 22:22:30 +00:00
TreeHugger Robot
daa9003533
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20877556
Change-Id: I1c14caa62062f58fa43ed0861d8f527ddcade3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 04:29:04 +00:00
TreeHugger Robot
66e23eb89c
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev
2023-01-17 03:56:35 +00:00
Behnam Heydarshahi
93ae531273
Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100
Change-Id: Id45cee329be0245b513ad3ddd4a405fef2efb223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 16:37:26 +00:00
Behnam Heydarshahi
cf022d4537
Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev
2023-01-12 16:15:27 +00:00
Josep del Río
98bfab5f23
Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev
2023-01-12 14:17:44 +00:00
Bill Lin
a597789661
Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev am: 34d144265d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20673972
Change-Id: I1b5fc399539a8f6585588c90a8481e0a8c4d5463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 07:02:24 +00:00
Milton Wu
fe819292e3
Fix face enroll introduction crash after 10mins am: 8e57808247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454691
Change-Id: I98f9468ff878f9aefb67e29b694a52eb1b910f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 07:02:12 +00:00
Bill Lin
34d144265d
Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev
...
* changes:
3-1/ Impl FoldProvider.FoldCallback for Face enroll activities
2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow
Fix face enroll introduction crash after 10mins
2023-01-12 06:47:45 +00:00
Xin Li
5482fb0301
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
...
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
2023-01-11 22:47:24 -08:00
Sorin Basca
a962b4b712
NEW Use Mockito 4.6.1 API
...
Addressing skipping merge issue
Bug: 236636175
Test: atest SettingsRoboTests
Change-Id: Ie7caae0ea9aa212f1ee06d6fe89fa0776979e4e6
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2023-01-12 01:35:44 +00:00
Behnam Heydarshahi
18469d2975
Ring & notif vol missing on a largescreen device
...
Before:
"Ring & notification volume" showed up in volume panel and in volume
settings.
Now (what prompted this bugreport):
A device config was changed to mark it not voice capable.
"Ring & notification volume" disappeared from both places;
"Notification volume" showed up only in volume settings, not panel.
Fix: the voice capable should not be a factor when determining
availability for ring/notification slices.
After this fix is applied:
"Ring & notification volume" to reappear at both settings and panel.
Bug: 256548882
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="VolumePanelTest|RingVolumePreferenceControllerTest|NotificationVolumePreferenceControllerTest|SeparateRingVolumePreferenceController" RunSettingsRoboTests -j40
Change-Id: Ie2b1913bde6a64303c4d9fde3724889f949c363b
2023-01-11 22:14:29 +00:00
Joshua McCloskey
4915a5932d
Added performant auth feature am: b8695b8e76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285
Change-Id: I1214d53edf57e1b45efd3d81c7e0305d83e94459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 21:38:32 +00:00
Joshua McCloskey
b8695b8e76
Added performant auth feature
...
Test: Manually verified in settings that the performant auth
feature(fingerprint) is disabled by default
Bug: 261216422
Bug: 265031172
Change-Id: I6422b12f801d038fa514758eca34efcbfdeef27a
2023-01-11 16:43:54 +00:00
TreeHugger Robot
02cace2f67
Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103
Change-Id: I1c586d8d135b6238662b228b2101ab4de4d369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:30:41 +00:00
TreeHugger Robot
61f81ffb07
Merge "Update wallet setting availability" into tm-qpr-dev
2023-01-11 14:54:39 +00:00
Behnam Heydarshahi
4fc098dc1b
Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598
Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 14:34:49 +00:00
Behnam Heydarshahi
ee56e95f90
Merge "Implement a separate controller for ring volume" into tm-qpr-dev
2023-01-11 14:08:01 +00:00
Treehugger Robot
8601b70e1c
Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194
Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 11:53:43 +00:00
Shen Lin
1721d0f276
Amend "Reset notification importance" list item style
...
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.
Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +00:00
Lucas Silva
600741c78c
Only show communal settings to the primary user am: e33639f117
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979
Change-Id: Ia66b6011f37412bbbdf783b3d5f844446f4fc1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 17:22:02 +00:00
Lucas Silva
e33639f117
Only show communal settings to the primary user
...
Fixes: 264284347
Test: flashed device, and verified settings don't appear for secondary
user. Setting still appears for primary user
Test: atest CommunalPreferenceControllerTest
Change-Id: I6686ce4dbc7d708a93131620ae93c5e0dc323995
2023-01-09 15:15:27 +00:00