Zoey Chen
bc561ec2dc
[Settings] Do not show SIM if not supported
...
Bug: 264510592
Test: manual
Change-Id: Iaf250175361d86837a62330391c4b529639c3d9d
2023-01-18 07:06:28 +00:00
Jason Chiu
ce290bda47
Merge "Update the About device icon for tablet" into tm-qpr-dev
2023-01-18 06:40:49 +00:00
Joshua Mccloskey
7882fe06c4
Merge "Set default value for performant auth." into tm-qpr-dev am: ead95a4205
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20986428
Change-Id: I27ded7770eb6804e8619b37b8c28b71624a9b2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-18 03:20:50 +00:00
Joshua Mccloskey
ead95a4205
Merge "Set default value for performant auth." into tm-qpr-dev
2023-01-18 03:09:58 +00:00
Bill Yi
d0f59453d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 127306a6a7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005863
Change-Id: I42abb744d4560b2c6865cb07162f6c847eb2e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 22:36:07 +00:00
Bill Yi
dc55fe3918
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9079430596
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005863
Change-Id: I7000ea8758566f2584099cf0b7cb9c00c191b716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 22:35:51 +00:00
Bill Yi
127306a6a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-17 21:47:45 +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
Joshua Mccloskey
6f9ddeb66f
Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev am: 0dd635f28f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20950039
Change-Id: Ia48a9d9e4214f18ac8e053e1137603bc84807f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 20:01:36 +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
Joshua Mccloskey
0dd635f28f
Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev
2023-01-17 19:35:31 +00:00
Piotr Wilczyński
2858620d25
Set display size to all displays
...
Bug: 197730930
Test: Open Settings, go to Display -> Display size and text -> Display size, change the value, fold/unfold the device, see that the value persists.
Test: DisplaySizeDataTest
Test: atest ScreenResolutionFragmentTest
Test: ScreenZoomSettingsTest
Change-Id: I3d6858a9b20798c2ad3b12a66db3484491682691
Merged-In: I3d6858a9b20798c2ad3b12a66db3484491682691
2023-01-17 17:30:12 +00:00
Joshua McCloskey
470c6b11b4
Set default value for performant auth.
...
Test: Manually verified its default to enabled.
Bug: 265264294
Change-Id: Ibbad0165f4ef396be70d3a566ca77597c2bcbb8e
Merged-In: Ibbad0165f4ef396be70d3a566ca77597c2bcbb8e
2023-01-17 17:07:54 +00:00
Behnam Heydarshahi
fd4ecf54b1
Merge "Always index RingerModeAffected slices" into tm-qpr-dev am: 673e191e98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20960954
Change-Id: Ib413d02f2fea5f9b379cd0425df4fd17b25660a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 14:57:00 +00:00
Behnam Heydarshahi
673e191e98
Merge "Always index RingerModeAffected slices" into tm-qpr-dev
2023-01-17 14:30:49 +00:00
Jason Chiu
5a0d63c5cd
Update the About device icon for tablet
...
Fix: 252728840
Test: visual
Change-Id: I5e772ef30be82da276bc0d7bf97c586992723365
2023-01-17 09:50:31 +00:00
TreeHugger Robot
e4c447eb02
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 732da7a440
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005884
Change-Id: I3be509cbcafb130c43e1057b1aaa67cf6746fc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 06:35:40 +00:00
Bill Yi
56e7ec7646
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57d520e0f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005884
Change-Id: Ib3dc39b5e25f7f3301fac437c345c21ab4741ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 06:35:18 +00:00
TreeHugger Robot
732da7a440
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-17 05:59:39 +00:00
TreeHugger Robot
daa9003533
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20877556
Change-Id: I1c14caa62062f58fa43ed0861d8f527ddcade3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 04:29:04 +00:00
TreeHugger Robot
66e23eb89c
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev
2023-01-17 03:56:35 +00:00
SongFerng Wang
40838101dd
Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev am: f71b548285
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20973543
Change-Id: Iff0e0f03886e414c36d508e5b17541514c1171f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-16 08:21:26 +00:00
SongFerng Wang
f71b548285
Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev
2023-01-16 07:44:37 +00:00
Bill Yi
57d520e0f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I981c21d4e5212beb0252f2ea8704015045383fac
2023-01-15 19:23:55 -08:00
Bill Yi
9079430596
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I53a234d7805064773be4dc133dbb7d6c81ae7075
2023-01-15 19:17:23 -08:00
Jason Chang
2cb8ea9496
Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727210
Change-Id: I0ad6727e5056a11d72714aec5dff289458c1f855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 13:07:37 +00:00
Betty Chang
fb8a7a3b55
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
am: c985a6d47d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: Ia5d97a91a9a52b044b7d016b80b67cf094d45acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 12:32:42 +00:00
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
Android Build Coastguard Worker
d382eee7e9
Merge cherrypicks of ['ag/20919289'] into tm-qpr2-release.
...
Change-Id: I93213ba09a855945301556ad149220d360ff8f29
2023-01-13 03:02:28 +00:00
Diya Bera
5b9653f581
Fixes background color in SUW fingerprint enrollment
...
Test: Manual (Enroll fingerprint in SUW, background color remains the
same)
Bug: 246231650
Bug: 250464527
Change-Id: Iffd1543d8b230199c3b925c6538bd418a381c96a
(cherry picked from commit 00dfcd83dc
)
Merged-In: Iffd1543d8b230199c3b925c6538bd418a381c96a
2023-01-13 02:59:44 +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