Commit Graph

18737 Commits

Author SHA1 Message Date
Jason Chang
fac5d59f1c Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 am: 9b94df1d40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: Ib0f3de4392a5f7fbf64aa405699358a34b3976dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 15:16:55 +00:00
Jason Chang
9522a44bb6 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev 2023-03-18 14:10:58 +00:00
Jason Chang
848973d300 Fix the Fingerprint enrollment page's title text creates a truncate
problem when it needs three lines on the R4 device

Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.

Bug: 269437675

Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.

2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.

3. Check the UI if it has been fixed.

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

Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
Michael Groover
0aa08f54f1 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 am: 4dc0e53808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: I9ac105df1154f75d3ec2e3fb5521eeb6335edbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:01:56 +00:00
Kweku Adams
7c82ea06a2 Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: eaba347a70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:45:56 +00:00
Michael Groover
8458e7f630 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev 2023-03-16 20:41:12 +00:00
Kweku Adams
9a087d6c19 Merge "Revert "Remove duplicate strings."" into udc-dev 2023-03-16 20:14:16 +00:00
Matías Hernández
25514d5380 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3 am: d0db72339d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305

Change-Id: I1240d0ea17e6fff1a9f15a3ec0bd215987c57214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 17:00:57 +00:00
Michael Groover
38819fd906 Make CheckReturnValue errorprone check a warning for unit tests
CredentialManagerPreferenceControllerTest now differs between the
current development branch and internal main, and the
CheckReturnValue errorprone is failing in the branches that use
the code from the development branch. Modifying
CredentialManagerPreferenceControllerTest does not resolve this
because it results in merge conflicts, but making this check a
warning in the development branch will allow the fix to reach all
affected branches.

Fixes: 273833063
Test: m RUN_ERROR_PRONE=true SettingsUnitTests
Change-Id: Ia923f0d988b1428cbb7378f33b4703ed19113dcd
2023-03-16 11:31:05 -05:00
Matías Hernández
08893ed0b3 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev 2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034 Refresh the app's "Conversations" list when there are none
Also hide the header in that case (simiarly to bubbles).

Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
2023-03-16 15:07:13 +01:00
Lifu Tang
caa1b51ef2 Revert "Remove duplicate strings."
Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
Michael Groover
5b5da43ef8 [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest
Change-Id: I34f808bc497971aa53fc7842159795d8407ed113
Fixes: 273763249
Test: atest CredentialManagerPreferenceControllerTest
2023-03-15 19:28:36 +00:00
Julia Reynolds
686e7169ca Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b am: 84671635cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168

Change-Id: I0531dfd13ac5a1639275fadd3432fedf893a1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 15:37:08 +00:00
Julia Reynolds
068a55384b Merge "Reduce jank when revoking notification permission" into udc-dev 2023-03-15 14:50:07 +00:00
Julia Reynolds
a331c50b53 Reduce jank when revoking notification permission
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields

Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
Jason Hsu
c2dffa7aa4 Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7 am: 54fffdc6ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622

Change-Id: I3d8dc59a5ade8161d2d43e6b1ee9fdf78f0bb9c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 12:50:52 +00:00
TreeHugger Robot
db2bd32285 Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d am: 59b7f47307
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162

Change-Id: I95a3d90e0b6f6bcd213c11ec3c4cb33e2132a4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 12:49:19 +00:00
Jason Hsu
9f29b957e7 Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev 2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d Merge "Hide Dock speaker plays from sound pages" into udc-dev 2023-03-15 11:52:38 +00:00
Matías Hernández
6b13d794bc Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e am: be3c8b66ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

Change-Id: Ifc5f1477f20b3c33075bc866ed473fbd5e6649b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 10:59:30 +00:00
Mill Chen
a860bf3220 Hide Dock speaker plays from sound pages
In order to ensure the setting only works on the analog docks, adding
the docking state checks.

Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
   displayed

Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
2023-03-15 10:25:32 +00:00
Matías Hernández
2cabe8786e Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev 2023-03-15 10:12:23 +00:00
SongFerngWang
7b9c22348a Avoid ANR when UI query network selection state
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
(cherry picked from commit 7b80b4ecd9)
2023-03-15 07:54:06 +00:00
SongFerng Wang
65734dd29b Merge "Avoid ANR when UI query network selection state" 2023-03-15 07:52:59 +00:00
SongFerngWang
7b80b4ecd9 Avoid ANR when UI query network selection state
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
2023-03-15 14:45:05 +08:00
Tom Hsu
2f4e3b3041 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 510b9b6b49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Iac2042b8bfe511b51551394b7e7cd5b0cb16da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 05:32:52 +00:00
Tom Hsu
29bcb4d553 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev 2023-03-15 04:21:02 +00:00
tom hsu
397f06abff Add Regional preference UI for Physical keyboard location.
Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
2023-03-15 12:10:21 +08:00
Lucas Silva
95d06ff9de Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:43:16 +00:00
TreeHugger Robot
e87159a591 Merge "Merge credential manager providers by package name" into udc-dev 2023-03-14 22:55:34 +00:00
Lucas Silva
d17cb44367 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:39:31 +00:00
Behnam Heydarshahi
8e10c8e488 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e am: 4f3401050d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: Ia429c3c5a8520b540b542a6634316d45f5ca15d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:59:55 +00:00
Lucas Silva
5671ddb191 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:54:01 +00:00
Lucas Silva
148f1592ef Merge "Add home controls button to screensaver settings" into tm-qpr-dev 2023-03-14 21:47:03 +00:00
Becca Hughes
0e6d91b778 Merge credential manager providers by package name
As part of the spec'd design we should merge providers
by package name this means that if there are multiple
providers they will be all turned on/off together.

Bug: 266772233
Test: make & atest
Change-Id: If7eec7d9a79a97ac3ec4f55b7cbcfaf7748d5750
Merged-In: Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928
2023-03-14 20:28:03 +00:00
Behnam Heydarshahi
a1daad718e Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I38f7acc1b1c5cbb08432d6e3b3229305da381379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:22:07 +00:00
Behnam Heydarshahi
afb4dd1ece Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I60aab9b333efc5d38f0cbc6f3635948bf734091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:43:25 +00:00
Behnam Heydarshahi
17701cd976 Merge "Extend settings panel under navigation bar" into tm-qpr-dev 2023-03-14 18:54:48 +00:00
Andreas Miko
51cb60cc7c Add setting to disable PIN animation and password am: 30bf66db42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281

Change-Id: I39f9675c5b3fc234608882780a62141061bf1e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:05:35 +00:00
Becca Hughes
dde593c363 Merge "Merge credential manager providers by package name" 2023-03-14 17:14:49 +00:00
Matías Hernández
0882b04ed5 Delete stuff related to removed "Conversations that can interrupt" settings
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
2023-03-14 16:53:53 +01:00
TreeHugger Robot
6650ee11cc Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920 am: 19aee83def
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043

Change-Id: I5e0791ccb1a3857b6b9bea875055521c3af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 09:13:45 +00:00
TreeHugger Robot
db7e7d0920 Merge "Put Android Core Apps under System apps" into udc-dev 2023-03-14 08:14:09 +00:00
Milton Wu
d3a1030f22 Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f am: b0b739a188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046

Change-Id: I9825613ac388bc9557a1c08542da4f6d8df87fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 08:03:34 +00:00
Milton Wu
ea3c207e6f Merge "Add biometrics v2 test" into udc-dev 2023-03-14 06:53:16 +00:00
Zaiyue Xue
702921c9ff Put Android Core Apps under System apps
Bug: 269188405
Fix: 269188405
Test: manual
Change-Id: Ie79cdb71c48661b6b1e90b8d0e7836269cf665e7
2023-03-14 13:53:08 +08:00
Milton Wu
ab488b3c5b Add biometrics v2 test
Add tests into FingerprintEnrollFinishViewModelTest and
FingerprintEnrollProgressViewModelTest. and also remove mDoneLiveData
from FingerprintEnrollProgressViewModel because no one uses it.

Bug: 271220339
Test: atest FingerprintEnrollFinishViewModelTest
      FingerprintEnrollProgressViewModelTest
Change-Id: Id74da29b7730a3e7feb8d0b263c28c8192adad9c
2023-03-14 04:33:12 +00:00
Andreas Miko
30bf66db42 Add setting to disable PIN animation and password
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-03-14 02:27:51 +00:00
Becca Hughes
043ba28892 Merge credential manager providers by package name
**This is a merge to master from udc-dev**

As part of the spec'd design we should merge providers
by package name this means that if there are multiple
providers they will be all turned on/off together.

Bug: 266772233
Test: make & atest
Change-Id: Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928
2023-03-13 22:35:58 +00:00