Commit Graph

27839 Commits

Author SHA1 Message Date
Steve Elliott
30ccc43ae1 Revert^2 "Add configuration for defaulting notification behavior"
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
2022-11-21 15:16:40 +00:00
Weng Su
b39fb9d21c Align same wording style with Settings main switch
- Update the main swtich title from "Adaptive connectivity" to "Use adaptive connectivity"

Bug: 216730079
Test: manual testing to confirm wording changes
Change-Id: I20004d8ffc6c9484e8aa68b36cc2a9c11ce764b6
2022-11-21 22:23:21 +08:00
TreeHugger Robot
62f0b933f1 Merge "Add a new special app access screen for long background tasks." 2022-11-18 17:16:52 +00:00
Florian Mayer
fb8537f03b [MTE] disable dev option if security setting is on
Test: make RunSettingsRoboTests
      check dev settings manually
Bug: 245624194
Change-Id: I3d9c9b89cd5483eee9800077943b1c30738e4c16
2022-11-18 09:09:28 -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
Jason Chang
764a786547 Merge "Add pad animation for STAGE_CENTER & STAGE_GUIDED" 2022-11-18 09:06:48 +00:00
Varun Shah
b33256a0fc Add a new special app access screen for long background tasks.
This new screen shows apps that hold the new RUN_LONG_JOBS permission.

Also add a reference to this screen in an app's info page under the
"Advanced" section for apps that have requested this permission.

Bug: 255821578
Test: atest AppFilterRegistryTest
Test: make -j RunSettingsRoboTests \
ROBOTTEST_FILTER="LongBackgroundTasksDetailsTest|
LongBackgroundTasksDetailsPreferenceControllerTest"
Test: visually via the Settings page

Change-Id: Idc498e52d29abc6df757c35e8bc91f00de92ba4a
2022-11-18 07:14:12 +00:00
Florian Mayer
c6ab4081c7 Merge "Add "beta" to Advanced memory protection." 2022-11-17 22:33:19 +00:00
Sam Dubey
c536eb4dc4 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1 am: 48eae58586
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: I0e2693f89594f6c473c5c2e9dbb6a34ea6bf5864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 14:29:58 +00:00
Sam Dubey
48eae58586 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 14:01:32 +00:00
Jason Chang
966ffa1b2a Add pad animation for STAGE_CENTER & STAGE_GUIDED
1. STAGE_CENTER reference
   - String : security_settings_sfps_enroll_finger_center_title
   - raw : udfps_center_hint_lottie

2. STAGE_GUIDED
   - String : security_settings_fingerprint_enroll_repeat_message
   - raw : udfps_center_hint_lottie (Same with STAGE_CENTER)

Bug: 228100413

Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"

Change-Id: Ic308b9bffee32b36f7280cf263c67adc3ca31c66
2022-11-17 10:13:10 +00:00
Bonian Chen
7dc161dcc8 [Settings] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Id5ea14ca888f0cfc6ed5a7df3f77a8176232ef4f
2022-11-17 09:01:09 +00:00
Sam Dubey
a2d06273c1 Revert "Add configuration for defaulting notification behavior"
Likely causing b/259499400

This reverts commit a92688d642.

Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
2022-11-17 07:33:18 +00:00
Bill Yi
66087f9266 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-17 05:24:20 +00:00
Florian Mayer
be2f4612dc Add "beta" to Advanced memory protection.
Bug: 245624194
Bug: 258550150
Change-Id: I9f4cef4898c603bfc9c46072762c9bf0f0db5194
2022-11-16 20:41:11 +00:00
TreeHugger Robot
73348a8859 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-16 20:36:20 +00:00
Bill Yi
544000b27b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I03421835110a4f99b59f5718e078f167c2b44443
2022-11-16 05:10:21 -08:00
Bill Yi
6ca3143821 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7236bbc1fc2cf971cac5361f6dd108fbb12e1e0a
2022-11-16 05:07:08 -08:00
Bill Yi
ece082dcaf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iabd3b4c4146bec3960af589135f39a5e2fe96d03
2022-11-16 05:04:31 -08:00
Bill Yi
87c94cc80b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1b4b6848dbeb3cb0698b7ca68ebdb02e799f1daf
2022-11-16 05:03:11 -08:00
Bonian Chen
20bcb7c5fb [Settings] Fix merge confliction
Follow code reviewer's suggestion to further split the code.

Bug: 259333639
Test: build pass
Change-Id: I40ee5f92dbb4550fec7e9bea108c30a2e5a0f770
2022-11-16 07:57:37 +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
Adam Bookatz
9703f6a154 Merge "Introduce concept of DockUser" into tm-qpr-dev 2022-11-16 00:59:41 +00:00
TreeHugger Robot
148774d287 Merge "Fingerprint Introduction FragmentActivity" 2022-11-16 00:04:49 +00:00
TreeHugger Robot
7765c7129b Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c am: 54170343cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: Ic5021313463c2fb955d2e5066a5b8f9dec4603fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:40:08 +00:00
TreeHugger Robot
54170343cf Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: I3f6ad58e5f8292642d7eb958402d172537536d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:00:52 +00:00
TreeHugger Robot
e2e892d46c Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev 2022-11-15 22:42:34 +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
TreeHugger Robot
abb864bbaa Merge "Move security_settings_sfps_enroll_finish to res-product" 2022-11-15 06:33:27 +00:00
Sandeep Jawalkar
5ac149af90 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" 2022-11-15 06:24:41 +00:00
sandeepjs
ecdfe28bd2 [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
2022-11-15 05:33:07 +00:00
Chaohui Wang
a5dfab3fc0 Move security_settings_sfps_enroll_finish to res-product
Bug: 253772249
Test: Make Settings
Change-Id: Id57c327573814cc99e11fede56f9a60a215fb494
2022-11-15 13:11:45 +08:00
Joshua Mccloskey
46b21bbab4 Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c am: 945d614158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129

Change-Id: Ie1e2f9e7e6ee04d24114eff301a86dd06ba96451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 02:41:05 +00:00
Joshua Mccloskey
945d614158 Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129

Change-Id: I9c88dcafd1cb73dae5dc1a7137ff78337d4d69bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 01:51:14 +00:00
Joshua Mccloskey
8bc66cbb9f Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178

Change-Id: Ib5ddf26067cdd3e07ebc414aa82306fee68e0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 01:50:46 +00:00
Joshua Mccloskey
0fb3dc390c Merge "Centered fingerprint icon" into tm-qpr-dev 2022-11-15 01:14:07 +00:00
Joshua Mccloskey
94ddcba809 Merge "Remove sidefps toggle from SUW." into tm-qpr-dev 2022-11-15 01:14:01 +00:00
Grace Cheng
57c6df710b [conflict] Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55ca am: aa3465b842
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20452306

Change-Id: I355e42fb9ea5bafe62006e152c52cd04cd62e109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:26:38 +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
Joshua McCloskey
c10d8ca045 Remove sidefps toggle from SUW.
Test: Verified manully that the toggle is no longer
present when enrolling sidefps.
Fixes: 258687688

Change-Id: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
Merged-In: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
2022-11-14 17:29:58 +00:00
Joshua Mccloskey
7190e3a56c Merge "Remove sidefps toggle from SUW." 2022-11-14 17:29:44 +00:00
Joshua McCloskey
cfaf707a78 Remove sidefps toggle from SUW.
Test: Verified manully that the toggle is no longer
present when enrolling sidefps.
Bug: 258687688

Change-Id: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
2022-11-14 16:22:12 +00:00
TreeHugger Robot
2c45688a13 Merge "Introduce concept of DockUser" 2022-11-14 15:00:56 +00:00
Bonian Chen
f2838421df [Settings] configuration for hidding SIM lock UI
Hide SIM lock UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: I70be07dbc1decb5cb8eff384d4cb8bea355ab99d
2022-11-14 12:00:06 +00:00
Bonian Chen
e1a0637c3a [Settings] configuration for hidding SIM remove UI
Hide SIM remove UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I8f0c1d53c4fe6e30280f2b7ae8f694cd27056e36
2022-11-14 10:19:27 +00:00
Bonian Chen
0e03586dda [Settings] configuration for hidding SIM provider UI
Hide SIM provider UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: Ibe22c3ba377a15f770622d235ebddc63b4bf3ed6
2022-11-14 10:06:48 +00:00
Milton Wu
b9b8b8a512 Fingerprint Introduction FragmentActivity
Introducing MVVM architecture & fragments to biometric settings.
Here, we modify the first page of FingerprintEnrollIntroduction to use
new MVVM with Fragment architecture.

And with this new architecture, unit test and screen order will be
easier to be written or changed.

Bug: 236072782
Test: atest FingerprintEnrollmentViewModelTest AutoCredentialViewModelTest
	    FingerprintEnrollIntroViewModelTest FingerprintRepositoryTest
Change-Id: Icf12c91625db86c2c99081a0108203e607e77f74
2022-11-14 15:36:03 +08:00