Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,416 Commits 1 Branch 0 Tags
420a8474db725d372fd2ec2ba5ff419bfb0366e8
Commit Graph

8435 Commits

Author SHA1 Message Date
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
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
sandeepjs
e69ab6cb77 [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: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
Merged-In: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
 2022-11-15 11:11:50 +00:00
Adam Bookatz
e5e232428d Introduce concept of DockUser 
Dreams and docking often refers to "user zero" or "system user".
But more generally, the special user for dreams or switching-to-on-docking
need not be user 0, and in fact won't be in certain modes. So this needs updating.

Test: the files mentioned in the topic
Bug: 257333623
Change-Id: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
Merged-In: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
 2022-11-14 19:19:21 +00:00
Grace Cheng
aa3465b842 Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20452306

Change-Id: I8b9b3ec232d2950b859f66c0ce547ea9ae9e3dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 19:06:02 +00:00
Grace Cheng
e4b09e55ca Merge "Update fingerprint enrollment finished string" into tm-qpr-dev 2022-11-14 18:35:16 +00:00
Grace Cheng
dd7e488197 Update fingerprint enrollment finished string 
Updates string displayed at completion of fingerprint enrollment

Test: Observe updated string after enrolling a fingerprint
Fixes: 257898484
Change-Id: I40ab1b67030f164c96c8abca0837bacc1560d1b5
 2022-11-12 00:08:10 +00:00
Zaiyue Xue
240ff56875 Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55bfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410009

Change-Id: I89a8e622134524f701e440a9bd3e2cf0c84fae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 09:33:08 +00:00
Zaiyue Xue
866203a3b8 Fix b/257404630 Inconsistent strings in battery chart 
Change all the "from last full charge" to "since last full charge".

Bug: 257404630
Fix: 257404630
Test: presubmit
Change-Id: Ib316e9fecac60f388e2b1810de9a65c540c52358
Merged-In: Ib316e9fecac60f388e2b1810de9a65c540c52358
 2022-11-09 02:39:22 +00:00
Joshua Mccloskey
4033cc7d0e Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190

Change-Id: I7f485c93b429fc2d2f75b1fc3e46d82a47e31c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 02:39:08 +00:00
Joshua Mccloskey
db266ca6b2 Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev 2022-11-03 01:56:52 +00:00
Grace Cheng
13d3bdc4c0 Implement SFPS “require screen on to auth” 
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
Merged-In: Ia44604b059c4847c40608419b2e16219976ced3e
 2022-11-02 14:34:59 +00:00
Lucas Silva
0e7f4d87ce Update the "When to dream" settings am: 47d84b41ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008

Change-Id: Id0ae8f8af81ab9cea7e61b1050e077afbe51a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 20:34:09 +00:00
Lucas Silva
47d84b41ac Update the "When to dream" settings 
For devices which don't support dreaming on battery, we can offer
simpler options since the device must always be charging for
screensavers to appear. Therefore there are only two options:

1. While charging
2. While docked and charging

Test: flashed and verified on device
Test: make -j64 RunSettingsRoboTests
Fixes: 226187572
Change-Id: I6ed24cda8874f2fb941f6cfded9ed97ed78a3cb6
 2022-10-28 13:07:36 -04:00
Yining Liu
7f6b3cc7ca Fix text in notification settings for apps that do not send notifications am: e899b4c96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: Ic748f560f9a4767b6c75349506ae569cde1473af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 23:29:27 +00:00