Steve Elliott
97ee8a8414
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: Ia7757a15bc4d4796fc7d573cc59b488453527038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 12:48:22 +00:00
Steve Elliott
caf6347d11
Merge "Update unseen notif filtering settings string" into tm-qpr-dev
2023-02-27 17:01:42 +00:00
William Escande
6ea3322de4
Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I34edde4f5dc5b5290f796d1bd8b5e8f07eab9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 08:11:05 +00:00
William Escande
57f3e9428f
Merge "Snoop Logger: fix descriptions" am: 5fd265405c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:21:57 +00:00
William Escande
5fd265405c
Merge "Snoop Logger: fix descriptions"
2023-02-23 05:58:19 +00:00
Jack Yu
86a6c6a9a7
Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: Id9fd40284b018c8cc3424d6a77c6f6f7bf43da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:16:45 +00:00
Jack Yu
08c64a4414
Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I28561bde03b8dd3cbf2394ea5c851b15b584da49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:15:02 +00:00
Jack Yu
0797feaf7b
Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4
Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:37 +00:00
Jakub Rotkiewicz
c0a7e8f8f0
Snoop Logger: fix descriptions
...
Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
2023-02-20 15:12:31 +00:00
Jack Yu
8f1794043c
Add a new NFC developer setting option for NFC vendor verbose log
...
Add a new developer setting option to enable vendor verbose log.
Bug: 204397062
Test: manual
Merged-In: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
(cherry picked from commit 3d2aff896e )
2023-02-17 17:28:36 +00:00
Jack Yu
a2f8944942
Add a new NFC developer setting option for NFCSNOOP
...
Add a new developer setting option to enable full NFCSNOOP log.
Bug: 204397062
Test: manual
Merged-In: I3fd34500e5e7093c9d77ff737987a35f6866814e
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
(cherry picked from commit b71de640b5 )
2023-02-17 17:27:38 +00:00
Steve Elliott
131598bc14
Update unseen notif filtering settings string
...
Bug: 267963644
Test: verify string changed in Settings > Notifications
Change-Id: Icc6db108d84eeb56192318a7ddba6505eaf1d262
2023-02-16 16:47:55 +00:00
Behnam Heydarshahi
d65e087b0d
Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988
Change-Id: I8043d9156b1602379a6580cffb29c5addf32d8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 15:01:11 +00:00
Behnam Heydarshahi
d9c3cf855f
Muting ring volume slider disables notification
...
With volume_separate_notification flag enbaled, muting ring volume
slice will cause notification volume slice to gray out.
There used to be a bug in which notification slice would not get
updated in response to a change in ring volume mute/unmute broadcast.
The resulting erroneous behavior was notification slider would get to
zero but not get grayed out. To fix that bug, VolumeSliceHelper listens
to ring stream mute/unmute broadcasts and forwards them to notification
slice.
Bug: b/266072907
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|VolumeSliceHelperTest" RunSettingsRoboTests -j40
Change-Id: I2ab51f1272bf99a0c3d9ca285354052d00910c90
2023-02-15 15:43:08 +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
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
Lucas Silva
2c7a55ed05
Add content description to screensaver customization button am: ca65b6e5ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21268649
Change-Id: Ia8a22edd2cdea63042d535d6ad7ebe3ae27d125d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-06 15:49:38 +00:00
Lucas Silva
ca65b6e5ba
Add content description to screensaver customization button
...
This will let users know which screensaver they are customizing.
Fixes: 267582102
Test: flashed device and enabled talkback, opened screensaver settings,
and verified talkback correctly says the name of the screensaver
Change-Id: I9d0d9422f06b7a78efca0e6953b73fe612f79e2a
2023-02-03 15:27:26 -05:00
Derek Jedral
f97be25252
Add strings for active unlock in settings am: 7e524288b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21085463
Change-Id: Iaa95d0da2da997d685cedffe6b9c0396c92f6e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-31 20:55:11 +00:00
Derek Jedral
7e524288b5
Add strings for active unlock in settings
...
Add strings that active unlock needs to consume when surfacing itself in
combined biometrics settings.
Test: none, strings aren't consumed yet.
Bug: 266583888
Bug: 240437016
Change-Id: I41e3b9c1830212303fc3379462e80cb18a23d026
Merged-In: I41e3b9c1830212303fc3379462e80cb18a23d026
2023-01-30 18:17:32 -08:00
Diya Bera
789071c86e
Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev am: 9f1e35fe1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21089906
Change-Id: Ie0b1bdb3ab1fe0a28362d7529431f890905507f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 00:55:28 +00:00
Diya Bera
9f1e35fe1a
Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev
2023-01-25 22:16:34 +00:00
Diya Bera
711f16ddd8
Added string to encourage user to enroll more fingerprints
...
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475
Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
Merged-in: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
2023-01-25 18:32:13 +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
c8a6db40ac
Merge "Setting to control seen notification filtering" into tm-qpr-dev
2023-01-20 23:22:56 +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
Diya Bera
3539c9e793
Merge "No scrolling required to see find sensor animation" into tm-qpr-dev am: 8d6aade6d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21010898
Change-Id: I91f462e490708b57efdd7b20ba982aa18d3301e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-18 21:47:34 +00:00
Diya Bera
8d6aade6d9
Merge "No scrolling required to see find sensor animation" into tm-qpr-dev
2023-01-18 21:13:18 +00:00
Diya Bera
c2a429f4f8
No scrolling required to see find sensor animation
...
Changed the string security_settings_sfps_enroll_find_sensor_message.
Changed the layout of the animation.
Test: Manually check the position of the animation
Fixes: 265023019
Change-Id: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
Merged-In: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
2023-01-18 17:07:49 +00:00
Julia Reynolds
b33e126865
Make strings generic for multiple form factors am: 7a77d31771
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022064
Change-Id: If98d3636ed7bebe10ddfae68f958fdd381710e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 21:31:28 +00:00
Julia Reynolds
7a77d31771
Make strings generic for multiple form factors
...
Test: view string in Settings
Fixes: 244123498
Change-Id: I8cf4eebf1400dd9faecb1a96023c6f48bd4157ed
2023-01-17 19:38:43 +00:00
Diya Bera
fd252fff94
Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301
Change-Id: I9edcd73ab9f7ab08d1f4305ecda92090171b140a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 20:03:22 +00:00
Diya Bera
6c703e12ae
Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev
2023-01-12 19:30:05 +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
Diya Bera
df0bddb516
Change in Fingerprint Error Dialog in Enrollment
...
Changed the dialog title for error UNABLE_TO_PROCESS
Test: Manual (check the error dialog associated with the errMsgId)
Bug: 261886132
Change-Id: I86bf31d363625a3138676a64e7356c9fecb178d8
2023-01-10 20:13:27 +00:00
TreeHugger Robot
26f47177a3
Merge "Update string" into tm-qpr-dev am: 8dc66bc482
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429
Change-Id: I484277c3466ccc0a48f276e3bd0b933ab6be34d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 20:00:50 +00:00
Julia Reynolds
fc63046f32
Update string
...
Test: view string in UI
Fixes: 262094151
Change-Id: I4f55c340d3144d446465d64008d9d92d622425ae
2023-01-10 16:23:57 +00:00
Grace Cheng
40fccabd62
Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853551
Change-Id: I7f51cad43e1a26e6cc421b8aa03106f545fc84fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 20:53:32 +00:00
Grace Cheng
a301ba8a68
Merge "Adding product string variants on choose lock page" into tm-qpr-dev
2023-01-04 20:30:37 +00:00
Yasin Kilicdere
541a984ce0
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 23:03:32 +00:00
Yasin Kilicdere
85379e9452
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 12:53:48 +00:00
Grace Cheng
04c630ca8a
Adding product string variants on choose lock page
...
Adding product string variants on choose lock page
Test: (manual) observe fixed string on tablet on choose lock page
Fixes: 250807976
Change-Id: I4a0ab0a019708f3e0d81602967b187f6a7089dc5
2023-01-01 21:26:52 +00:00
Sandeep Jawalkar
3279e1a211
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc am: aa0205daf9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542
Change-Id: I663ea43a6e1e06b456a5a024bc7773e10cd03a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-22 04:26:13 +00:00
sandeepjs
beab3c0d43
[Android U][eSIM] Modify esim and sim card strings as part of esim primary
...
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126
Test: build
Bug: 257380320
Change-Id: If2183945054255d52e89a61a04db25edd725a73d
2022-12-21 12:01:01 +00:00
Darrell Shi
2287f6e2e9
Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115
Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:55 +00:00
Darrell Shi
e722587923
Merge changes from topic "hub-mode-settings" into tm-qpr-dev
...
* changes:
Add top-level Communal settings.
Change screensaver ctrlr to base pref ctrlr.
2022-12-21 08:03:49 +00:00