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
Darrell Shi
65836b1e3d
Add top-level Communal settings.
...
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.
Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
2022-12-21 04:10:56 +00:00
Zoey Chen
c76250cd50
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651
Change-Id: I2ea8ed881d1bcd91427f44b0fb866195fa289b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 07:04:37 +00:00
Zoey Chen
e99f20df58
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev
2022-12-19 06:20:37 +00:00
Zoey Chen
e45ab97777
[Settings] Add search keywords for APN controller
...
Screenshot: https://hsv.googleplex.com/4816766300585984
Bug: 254024521
Test: atest ApnPreferenceController
Change-Id: I219256efff8d5859d029b190bf2cc73b8e83a746
2022-12-16 11:36:16 +00:00
YK Hung
e7ec6ee025
Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c68f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827
Change-Id: I7d3f436b5e7da6c380402014813d0233c55b0b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 05:24:33 +00:00
YK Hung
cf8ab7eef3
Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066
Change-Id: I271e279c86e90360b9fae18f96dc8c913f9f430f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 05:23:35 +00:00
Zhenwei Chen
35caf2ffb7
Update dock defender helper URL
...
Bug: 261206713
Test: Unit test passed
Change-Id: I6a8489b7e1a54d2c1d88cf6b04c8d1a4c9c6c235
2022-12-15 10:09:55 +00:00
Zhenwei Chen
1eea27ae82
Update string for all defenders
...
Test: Unit test passed
Bug: 262508668
Change-Id: Ia0126f9761caa43d0746962a9bb77173e9f45ad1
2022-12-15 05:31:18 +00:00
Darrell Shi
ef4fb09916
Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706
Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-12 17:01:34 +00:00
Darrell Shi
d1f5edfc78
Update screensaver preference summary when on.
...
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".
Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'
Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
Merged-In: I40483f266c42a6e49e513208ba513d469d67f85a
2022-12-09 17:36:01 +00:00
Yasin Kilicdere
ee476cab18
Remove the fallback AddSupervisedUserActivity.
...
Rollback the changes done in ag/16388725 and ag/16709333
Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I75b85df50a3caff55375ad261a97225377644a38
(cherry picked from commit 86f3500439 )
Fixes: 249057848
2022-12-07 15:23:37 +00:00
Ale Nijamkin
092de727b9
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875
Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev
2022-12-05 19:38:16 +00:00
Grace Cheng
ebda524556
Removes duplicate SFPS string and updates references am: 0d74f4b755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: Ifb08c7bdaf0871228620d731c72943ea91272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:47 +00:00
Grace Cheng
af2896195e
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev
2022-12-03 05:37:34 +00:00
Alejandro Nijamkin
f31108f11a
Specifies nav destination when opening shortcuts.
...
Doing this will open the correct screen when clicking on "Shortcuts"
under Settings > Display > Lock screen.
Fix: 258471384
Test: manually verified that clicking on it opens the wallpaper picker
experience with the correct page showing.
Change-Id: I627bcb9c9fac7a834f1c9d9cb36b73a6c8817af5
2022-12-02 16:08:32 -08:00
Grace Cheng
0d74f4b755
Removes duplicate SFPS string and updates references
...
Removes duplicate security_settings_fingerprint_v2_home_screen_text string and replaces references with security_settings_fingerprint_enroll_finish_v2_message
Test: Open fingerprint settings on SFPS device where fingerprints are enrolled, observe correct string
Fixes: 259316600
Change-Id: I259669a09f5535f3a776793659e5bc6bdb90a44c
Merged-In: I259669a09f5535f3a776793659e5bc6bdb90a44c
DO NOT MERGE
2022-12-02 23:50:37 +00:00
Wesley Wang
eb565adf5d
Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769
Change-Id: I5944ee42fe0e6da8a3e3a815ec3cebbabb79b155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 17:21:36 +00:00
Zhenwei Chen
1d72ff642c
Add dock defender battery tips
...
1. Remove the dock defender v1 code
2. Add dock defender battery tips and update
corresponding list item string
Bug: 260687359
Test: Unit test passed and manual test on device
Merged-In: Ib6c09df056744142f42f5e2a13252b58e54c7534
Change-Id: Ib6c09df056744142f42f5e2a13252b58e54c7534
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
(cherry picked from commit 8d11d9ceea )
2022-11-29 10:31:37 +00:00
TreeHugger Robot
6c7910557e
Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460
Change-Id: Idb43b7a13130da5c2aa84df780d42aeca0771b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 03:17:16 +00:00
TreeHugger Robot
6f908bae6f
Merge "Adds settings item for quick affordances." into tm-qpr-dev
2022-11-22 02:59:15 +00:00
Alejandro Nijamkin
01df2b4ee2
Adds settings item for quick affordances.
...
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.
Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen
Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
2022-11-21 16:42:45 -08:00
Sandeep Jawalkar
dce53c2f80
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 5a34a5b3de am: 38d97f7882
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2301705
Change-Id: I55f13a8ae5bc858e5a42f400550329025cc17254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 13:23:23 +00:00
Sandeep Jawalkar
38d97f7882
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 5a34a5b3de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2301705
Change-Id: I66171e26c9b3dd44db9206dc15c286d0d404d54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 12:58:56 +00:00
Adam Bookatz
632754a466
Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629
Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 01:23:04 +00:00