PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,612 Commits 1 Branch 0 Tags
245def5cad2840485d0b49a1672ea672381b95cc
Commit Graph

111612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chang
bfa35a7b1e Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev 2023-01-13 12:31:40 +00:00
Betty Chang
c985a6d47d Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 11:58:35 +00:00
Jason Chang
8c5bcaa374 (2/2) Fix settings face enrollment UI layout problem 
To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button

Bug: 260653042
Bug: 263065347

Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"

Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
 2023-01-13 10:48:50 +00:00
Betty Chang
d7e16c22f6 Merge "[LE Audio] To add the vibrate when the scan is successful" 2023-01-13 10:34:12 +00:00
Ayush Sharma
f857fd4357 For top layout use FrameLayout than GlifLayout 
In these xml files we are having nested GlifLayout, that I think
messes up the UI

Bug: 237169259
Test: Manual
Change-Id: I9df8b1b7b5c19c61b92b30432bc7d78325876425
(cherry picked from commit 3dcf68f321)
Merged-In: I9df8b1b7b5c19c61b92b30432bc7d78325876425
 2023-01-13 09:51:21 +00:00
Xin Li
8fddc2a74a [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5482fb0301 -s ours 
am skip reason: Merged-In Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0 with SHA-1 2681d8cc05 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20956124

Change-Id: Iffc03515779701859b256b2b5384612eaa45a63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 08:08:01 +00:00
SongFerng Wang
fe5978cde1 Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" 
This reverts commit 078ecbd765.

Reason for revert: The in-market device have error by some unknown reasons at b/264371574. To revert it, then the settings wait the 25s, it can protect the system has enough time for enabling esim.

Change-Id: Ic17380f549c764306851ad5cba6360f68df9b9b5
 2023-01-13 04:18:34 +00:00
Joshua McCloskey
a11c6b5a64 Fixed additional lottie flicker in fp settings. 
Test: Verified in fingerprint enrollment, the lotties no longer flicker
Fixes: 265194279
Change-Id: Ia88207ce7e520c6c180acdc21d03350976c10b17
 2023-01-13 02:50:21 +00:00
changbetty
ca475a5d37 [LE Audio] To add the vibrate when the scan is successful 
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
 2023-01-13 02:30:23 +00:00
Behnam Heydarshahi
1c3a9421a7 Always index RingerModeAffected slices 
When indexing slices, SliceDataConverter makes an exception for
RingerModeAffected slices. They can be !isAvailable() but still be
added to the list of slices.

Bug: 259084354

Test: Manual. Enable systemui DeviceConfig flag
volume_separate_notification. Open volume dialog.
Verify that ring & notification slice is split into ring slice and
notification slice.

Change-Id: Iaab30154025cd082b388c412da6ecd573b8d6fcf
 2023-01-12 22:25:27 +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
Mady Mellor
599d990913 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: Ie1a6ecdc7b6a896c5839bda765a3e2ad359dd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 18:49:52 +00:00
Mady Mellor
912ace3032 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev 2023-01-12 18:16:04 +00:00
Behnam Heydarshahi
93ae531273 Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Id45cee329be0245b513ad3ddd4a405fef2efb223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:37:26 +00:00
Behnam Heydarshahi
811fb9fa8d Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev am: 9d63dc8b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806122

Change-Id: Ib2c89b96573a37e3856da1d8db240ec151eeb422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:37:14 +00:00
Behnam Heydarshahi
cf022d4537 Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev 2023-01-12 16:15:27 +00:00
Behnam Heydarshahi
9d63dc8b6e Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev 2023-01-12 16:14:15 +00:00
Josep del Río
5bff56abab [automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 98bfab5f23 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20918022

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20947426

Change-Id: I8eb25f71cf788e590d6033e156cd0c4b67e548c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:50:31 +00:00
Sorin Basca
721798dc8c [automerger skipped] NEW Use Mockito 4.6.1 API am: a962b4b712 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20918022

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20947426

Change-Id: Ie2483910aa01e825f3257f0d07c3fc399d434835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:49:47 +00:00
Josep del Río
98bfab5f23 Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev 2023-01-12 14:17:44 +00:00
Bill Lin
81974ace76 Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27ec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454693

Change-Id: I69f420a942336d1fb589793662d1e700fa64b173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 08:11:01 +00:00
lbill
4e148d71f1 2/ Define pattern view size by UX deck am: 43f0076830 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20426387

Change-Id: Id6d15e9cb8db5488676fdd395885c8f10f55fcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 08:10:24 +00:00
Bill Lin
3959e27ec1 Merge changes from topic "pattern-view-size" into tm-qpr-dev 
* changes:
  3/ SUW lib Glif and theme add additional padding in sud_layout_content
  2/ Define pattern view size by UX deck
 2023-01-12 07:56:23 +00:00
Bill Lin
a597789661 Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev am: 34d144265d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20673972

Change-Id: I1b5fc399539a8f6585588c90a8481e0a8c4d5463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:24 +00:00
lbill
516ef08351 2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow am: e05697fc65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727251

Change-Id: Ib401d8eeb89c916a9cf934f6dcce6bc101d6965a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:18 +00:00
Milton Wu
fe819292e3 Fix face enroll introduction crash after 10mins am: 8e57808247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454691

Change-Id: I98f9468ff878f9aefb67e29b694a52eb1b910f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:12 +00:00
Bill Lin
34d144265d Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev 
* changes:
  3-1/ Impl FoldProvider.FoldCallback for Face enroll activities
  2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow
  Fix face enroll introduction crash after 10mins
 2023-01-12 06:47:45 +00:00
Xin Li
5482fb0301 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
 2023-01-11 22:47:24 -08:00
Sorin Basca
a962b4b712 NEW Use Mockito 4.6.1 API 
Addressing skipping merge issue

Bug: 236636175
Test: atest SettingsRoboTests
Change-Id: Ie7caae0ea9aa212f1ee06d6fe89fa0776979e4e6
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2023-01-12 01:35:44 +00:00
Diya Bera
81ab030e4c Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289

Change-Id: I18729fd0f253008a29d9da947e833cab42238efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:17:04 +00:00
Joshua Mccloskey
dc0f04d7ee Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688

Change-Id: I22bee3710fa6cdf31c15aae69691f94ddf38aa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:12:33 +00:00
Diya Bera
dc071e94cd Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev 2023-01-11 23:52:35 +00:00
Joshua Mccloskey
7b8bddaac0 Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev 2023-01-11 23:43:54 +00:00
Behnam Heydarshahi
18469d2975 Ring & notif vol missing on a largescreen device 
Before:
"Ring & notification volume" showed up in volume panel and in volume
settings.

Now (what prompted this bugreport):
A device config was changed to mark it not voice capable.
"Ring & notification volume" disappeared from both places;
"Notification volume" showed up only in volume settings, not panel.

Fix: the voice capable should not be a factor when determining
availability for ring/notification slices.

After this fix is applied:
"Ring & notification volume" to reappear at both settings and panel.

Bug: 256548882

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="VolumePanelTest|RingVolumePreferenceControllerTest|NotificationVolumePreferenceControllerTest|SeparateRingVolumePreferenceController" RunSettingsRoboTests -j40

Change-Id: Ie2b1913bde6a64303c4d9fde3724889f949c363b
 2023-01-11 22:14:29 +00:00
Behnam Heydarshahi
acea45544e Fix Maps PIP issue: DeviceConfig permission denial 
Problem:
Exception thrown when maps was in PIP mode.

Solution:
Use Binder to give permission to Settings reading device config
SEPARATE_VOLUME_NOTIFICATION.

Bug: 261809910
Test: Manual. (from bug report) Launch Maps and navigate to a place.
Minimize maps app. Open Settings. Should open normally and not crash.

Change-Id: I38735ebc7d555ead54e3aa77b50e4a7077fe452b
 2023-01-11 22:10:23 +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
Kevin Liu
c41c1fb83c Revert "[automerger skipped] resolve merge conflicts of 521278a0..." 
Revert submission 20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Reason for revert: Automerger did skipped some of the important CLs will resubmit to tm-qpr-dev

Reverted changes: /q/submissionid:20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Change-Id: Ib639a1d8c81a1b3fcd8504704f55854fc36f4cb5
 2023-01-11 18:24:54 +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
Kevin Liu
8f5103a748 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours am: 988e1712a3 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20918022

Change-Id: Ib4d64f88405e9e6a7925787ba2d4bd3c28ac69ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:31:12 +00:00
TreeHugger Robot
02cace2f67 Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103

Change-Id: I1c586d8d135b6238662b228b2101ab4de4d369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:30:41 +00:00
Kevin Liu
988e1712a3 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20918022

Change-Id: I341ba1b28ad4b7b14da45f2e8c62c20d19d6fe91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:14:54 +00:00
TreeHugger Robot
61f81ffb07 Merge "Update wallet setting availability" into tm-qpr-dev 2023-01-11 14:54:39 +00:00
Behnam Heydarshahi
4fc098dc1b Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598

Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 14:34:49 +00:00
Behnam Heydarshahi
ee56e95f90 Merge "Implement a separate controller for ring volume" into tm-qpr-dev 2023-01-11 14:08:01 +00:00
Treehugger Robot
8601b70e1c Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:53:43 +00:00
TreeHugger Robot
e9da17a8b9 Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I1ce36528fa8ae6d30ad6aecc880c3bbf905fabba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:36:19 +00:00
TreeHugger Robot
b464bfa049 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550

Change-Id: I4e713518a4f0de69a4d85514315048d438b53fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:35:17 +00:00
Treehugger Robot
9c8ff84746 Merge "Amend "Reset notification importance" list item style" am: aef592eb18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ife8b88093010ff9fea43758057d334bbea50540a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:19:53 +00:00
TreeHugger Robot
fb0986623f Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev 2023-01-11 11:05:12 +00:00