Wu Ahan
0067e9581b
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 13:44:52 +00:00
Wu Ahan
3a2ef6db2f
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev
2023-03-22 03:46:30 +00:00
Milton Wu
544feb9013
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I1a80e569626469eaca583007ee94fb77bf36f03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 00:57:38 +00:00
Milton Wu
1d68fbf007
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev
2023-03-22 00:26:50 +00:00
Android Build Coastguard Worker
f1a73be6c6
Snap for 9787270 from 6d6736c1c9
to tm-qpr3-release
...
Change-Id: I61ce7db47cd15b890dc9d2db2c80238cb82e7174
2023-03-21 23:28:51 +00:00
lbill
c7dd729a43
Launch Face Settings when device enrolled face
...
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.
As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.
In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().
Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.
Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
2023-03-21 19:10:57 +00:00
Sally Yuen
1795481a72
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 17:46:07 +00:00
Sally Yuen
6d6736c1c9
Merge "Update Extra dim banner for tablets" into tm-qpr-dev
2023-03-21 16:33:06 +00:00
Josh Hou
7076cbc015
[Panlingual] Can't set per-app languages for apps on work profile page
...
Use startActivityAsUser instead of startActivity API to start the AppLocalePickerActivity of different users
Bug: 274378136
Test: 1. Perform AppLocalePickerActivityTest robolectric test
2. Perform the manual test by switching different users
3. Perform the manual test by switching different profiles
Change-Id: I0dfc40b29a7a35f18f6bcffd22fb421c6ad9c230
Merged-In: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
2023-03-21 11:03:27 +00:00
Ahan Wu
ae84ac3530
Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment
...
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.
Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
2023-03-21 06:27:51 +00:00
Android Build Coastguard Worker
9fbe05dce9
Snap for 9779625 from d911a095eb
to tm-qpr3-release
...
Change-Id: Ibc0956cbd5a5bb9fe3c4f97c7651fb69954f7d21
2023-03-20 23:25:47 +00:00
Betty Chang
aa7ec2d5fe
Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
am: 00a7d0788f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: I7f299924d39ddc0952b301e622e4009064e923f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 10:29:38 +00:00
Betty Chang
00a7d0788f
Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: I5ea028e5cab8a83b445d5590f0ae9f3965fb8e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 09:53:01 +00:00
SongFerng Wang
782bb2f069
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268
Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 09:29:21 +00:00
Betty Chang
9541363952
Merge "[LE Audio] Set activity for result after scanning the QR code"
2023-03-20 09:28:31 +00:00
SongFerng Wang
d911a095eb
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev
2023-03-20 08:59:12 +00:00
Betty Chang
0fd1625895
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I704c81ac2d045142be5c7cc1835efa6d46cd2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 07:35:52 +00:00
Betty Chang
1de44c2447
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I3747bf58a841c0c0213d6b27525d9aee992f85bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 06:59:18 +00:00
changbetty
7cf90fbe36
[LE Audio] Set activity for result after scanning the QR code
...
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-20 06:48:36 +00:00
SongFerngWang
88717f2c3f
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
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
2023-03-20 14:42:18 +08:00
Betty Chang
18eb985e41
Merge "[LE Audio] To remove the broadcast source item that created by receive state"
2023-03-20 06:33:42 +00:00
changbetty
85dd572f18
[LE Audio] To remove the broadcast source item that created by receive
...
state
- When the user clicks another broadcast source and wants to join,
we will remove the previous item that created by getAllSource().
And trigger the search again.
Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
Merged-In: I416f0a39e31276876e63360664555f99dd7297c9
2023-03-20 05:48:34 +00:00
Android Build Coastguard Worker
7408842789
Snap for 9774378 from 77b98813c3
to tm-qpr3-release
...
Change-Id: I859078a79aa6e9b976fae4ba61a9c9bb28585191
2023-03-19 22:04:53 +00:00
Bill Yi
239e6fb371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: I1ca121ca22fea96d7e31a26814f1d37a3718f44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:46 +00:00
Bill Yi
11970fc875
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: If014a60d0905d772a9b86e6ead2abb604c1bb726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:35 +00:00
Bill Yi
fe39800ae9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: If3b0bc9aa7a005b7a408628254ab71028bec9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:22 +00:00
Bill Yi
d4b4e93227
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I3937a3f3b9fe3b0f28f18118bf38fec03ed22256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:47:59 +00:00
Bill Yi
77b98813c3
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-19 20:02:05 +00:00
Bill Yi
5f0516e69b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-19 20:02:05 +00:00
Android Build Coastguard Worker
d52e8de57a
Snap for 9772861 from e9c795c96b
to tm-qpr3-release
...
Change-Id: I6a83cdf7bc230c3c319b8f189425ed1c01838066
2023-03-18 21:25:40 +00:00
Grace Cheng
59992bbbb8
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565
Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev
2023-03-18 06:18:32 +00:00
Android Build Coastguard Worker
fe03a21b5f
Snap for 9769489 from 34db15a008
to tm-qpr3-release
...
Change-Id: I98ff47ee9d4dcad951ecccd47769728b96813b29
2023-03-18 01:26:16 +00:00
Darrell Shi
2119a2dcf9
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev
2023-03-17 15:47:23 +00:00
Pingzhi Wang
417b4a8537
Hide TTS search results if no TTS engine is available
...
If there is no Text-to-speech engine available/installed then
disable page search
Bug: 274007225
Test: Manual
Change-Id: Id734a69e742d9598be6824177d1a7d115ba6e594
2023-03-17 11:25:14 +01:00
Bill Yi
71e954c78b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79c7f425dac1cd278eface63dc0c3702616bfc88
2023-03-16 20:45:10 -07:00
Bill Yi
82c23db452
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
2023-03-16 20:40:36 -07:00
Android Build Coastguard Worker
a9d95f1fc2
Snap for 9760407 from 92babcaef5
to tm-qpr3-release
...
Change-Id: Ic04d5b362b2069b8f6490c060a56ddc6f69defdc
2023-03-16 23:24:52 +00:00
Menghan Li
2600b1bbc2
[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737
-s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I204ee5dc7a8861b51d06420c6bb1d4ff7b216c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:59:03 +00:00
menghanli
6f478f1a6b
[automerger skipped] Update color-check-baseline.xml am: 796fcccd9b
-s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I6a67de10b42d08b3786b01928377d020c8513630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:58:48 +00:00
Menghan Li
1306ebf737
Merge "Update color-check-baseline.xml" into tm-qpr-dev
2023-03-16 20:29:25 +00:00
Sally
611d1adff3
Update Extra dim banner for tablets
...
The corner radius on top left/bottom right now map to the device frame
Bug: 273553096
Test: manual check of light and dark theme
Change-Id: I8005ecdaa0d96df2e6b73a4e3b791a964f231708
2023-03-16 17:30:31 +00:00
menghanli
796fcccd9b
Update color-check-baseline.xml
...
(Fixed according to the instructions in prebuilts/checkcolor/README.md)
Bug: 273556105
Test: repo upload checks
Change-Id: Iaf4ab9f6cc1c836348226bc36358cbb73d2583d2
Merged-In: Ife355166df080ce7371a95b5cea28575227153f0
2023-03-16 02:29:38 +00:00
Android Build Coastguard Worker
a8f517b347
Snap for 9752887 from 7626600bbf
to tm-qpr3-release
...
Change-Id: I8e34019c0e0beed23acb9d61cffce1efbcc10ae6
2023-03-15 23:25:04 +00:00
Dmitry Dementyev
c03f2fe49c
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
am: a3d15a91e1
am: 92babcaef5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ib6464d437f7b2ead5cd9b00f13431149979ff8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:11:46 +00:00
Dmitry Dementyev
92babcaef5
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
am: a3d15a91e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Id32c9274ed8290b709328924d698dbdf130b8d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:55:00 +00:00
Diya Bera
ed1bb20ff1
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586
Change-Id: I190752b9c2a65024c140b7dab92524097c183ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:52:07 +00:00
Diya Bera
f7359a5001
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev
2023-03-15 22:28:10 +00:00
Dmitry Dementyev
a3d15a91e1
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I33ee7b0b3fd191ed993a3537d598d102c2d6ffb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:18:42 +00:00