Android Build Coastguard Worker
594327ad29
Snap for 9137459 from a94259a716
to tm-qpr2-release
...
Change-Id: Ided1f283f27b20579d7f175aab5c300eda513946
2022-10-04 23:26:40 +00:00
TreeHugger Robot
a94259a716
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-04 01:45:21 +00:00
Android Build Coastguard Worker
f356899401
Snap for 9133013 from db09b990a0
to tm-qpr2-release
...
Change-Id: I7ff83f8565e0d4de2232ec6631c9c75f2b4710a7
2022-10-03 23:28:40 +00:00
Bill Yi
130ca8d869
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1d704580d378aceba24a558590c41bf16b97b07
2022-10-03 13:19:00 -07:00
Bill Yi
ad1d5c5080
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I16b0a52db27e52e07af91f9a7b88796c5bbec9c8
2022-10-03 13:16:02 -07:00
TreeHugger Robot
db09b990a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I91e0858307d1055b300a67ae7ba22b9897bac4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:54:31 +00:00
Bill Yi
0aca2c219d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I6dd06d608b1b319d2214514a145b7c178378bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:54:11 +00:00
TreeHugger Robot
5b8a3aabaa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-10-02 07:26:20 +00:00
Bill Lin
e5a4e38c8c
Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev
2022-09-30 23:54:31 +00:00
Bill Yi
e7722ef90c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ice33ed5798d03b887d2d0feb637ddeb37223c7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:56:21 +00:00
Bill Yi
4bf99a1f0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I494de493df292a1ae0cb827d75b1a3458f4c65b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:46:53 +00:00
TreeHugger Robot
12a1ed5662
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-30 18:14:33 +00:00
Grace Cheng
c6d9164dd4
Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev
2022-09-30 17:05:30 +00:00
lbill
39175b2f87
Do not override SUW Glif theme when onApplyThemeResource() callback
...
1. Accodring to settings & setupdesign lib theme architecture
Only force apply sytle SetupWizardPartnerResource for current
activity/contextThemeWrapper is sufficient, override GlifV3Theme
again will cause incorrect resource mapping of private attributes.
2. Set Theme_AlertDialog style for AlertDialog in for Material design
- FingerprintEnrollEnrolling
- FingerprintEnrollFindSensor
3. Add test for AlertDialog theme, and fix broken test cases
Fixes: 245684949
Bug: 249789759
Bug: 248994476
Test: manual in SUW `adb shell cmd uimode night yes` and check visual
Test: manual in SUW enrolling check timeout dialog apply theme
Test: manual in SUW enroll UDFPS tips lottie view showing expectedly
Test: manual in SUW enroll UDFPS landscape showing correct layout
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
SetupFingerprintEnrollFindSensorTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollEnrollingTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollFindSensorTest
Change-Id: I17cbf26e38318e6681ba124d23bf86317a0f1e1d
2022-09-30 04:58:28 +00:00
Bill Yi
3ce9e908f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb582089c3601dcd3dc8e5c47d36da97b0be9c0d
2022-09-29 18:57:44 -07:00
Bill Yi
cf54fdb73b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I095695f0dfaf97b6944010e51b3b1463c3b7fbb0
2022-09-29 18:54:45 -07:00
Bill Yi
e289b0f368
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a1027d900d021590709e82299a9dee0533e380d
2022-09-29 18:51:56 -07:00
PETER LIANG
937821f30f
Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev
2022-09-30 00:00:14 +00:00
Grace Cheng
6b27a8bb70
Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev
2022-09-29 23:29:30 +00:00
Grace Cheng
6c72ef89b2
Show lottie on non-default display density on SFPS
...
Continue showing lottie when text size/display size is changed on SFPS, because unlike C10/P10, lottie will not overlap text on SFPS
Test: (manual) Change display size and text size to max, verify lottie is visible and does not overlap text
Fixes: 245029066
Change-Id: I041415abc21722052a9adbdc927847c42cd7619f
2022-09-29 19:42:59 +00:00
Grace Cheng
990af9ea7a
Fixes DT enrollment asset showing in light mode
...
Moves DT->LT dynamic color mapping call to after animation asset is set
Test: (manual) In light mode, advance past fingerprint enrollment edu screen and hit back button, observe correct LT asset
Fixes: 246233066
Change-Id: I5425f57b151a6f586338497ee0e5bf247af55f6e
2022-09-29 17:47:33 +00:00
Tom Hsu
43ceaa85ee
Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev
2022-09-29 15:52:32 +00:00
Peter Liang
8ca60482c2
Fix that when I go to display size in the settings, the largest size shows the smallest icons.
...
Root cause:
Preview didn't instantly be updated when scrolling the Display size.
Solution:
Get the value from preferences when scrolling, and from the display size data value when initializing.
Fix: 248748575
Test: manual test
Change-Id: I441766e0fd97ec1ac287d5bd4191693b2490c552
2022-09-29 06:23:32 +00:00
Tom Hsu
a4c78e3820
Revert "[Languages] Add new information to system language page."
...
This reverts commit 3cbb6f8680
.
Reason for revert: b/248456615
Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
2022-09-29 04:38:30 +00:00
TreeHugger Robot
2be7d6f16b
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours am: f2f310cdf1
-s ours am: dbf2abbc34
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I683f9b0338560c2cb26f040f1990e6fc564e33ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 00:26:21 +00:00
Milton Wu
57368a950e
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours am: 34d43eb70f
-s ours am: c67009349d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia7986779a2bc1cc0c2ff293af90593561fbeba6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 00:26:20 +00:00
TreeHugger Robot
dbf2abbc34
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours am: f2f310cdf1
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I7fc4fa7a292b42925d1513419aecacb03451a982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:56:38 +00:00
Milton Wu
c67009349d
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours am: 34d43eb70f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8044661be70d553e25fdcf3aa423af92c0feda5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:56:37 +00:00
TreeHugger Robot
240745ee63
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I66012bf2ae40ebe67bb874663b5123867e80700a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:38 +00:00
Milton Wu
d9cc9813c3
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I7aa21e8994679c4a90fbc590f2caa080983cb7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:37 +00:00
TreeHugger Robot
f2f310cdf1
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I26feba1ff77c83e08c57817dd36574b7b7218472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:53 +00:00
Milton Wu
34d43eb70f
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ib0958dfb6feb7edf36142450b8998a079ede6277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:49 +00:00
TreeHugger Robot
785e311159
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia4267770be69e08e5e4094a092659b8e1d4625e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:28 +00:00
Milton Wu
fcffcdd692
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:27 +00:00
TreeHugger Robot
4f3cd58c02
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I158405e4b86b56d57116e838b6454984f2cdf13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:25 +00:00
Milton Wu
14584ec665
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8c364167356ffcd830c14644f0bbd39da6730bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:24 +00:00
TreeHugger Robot
7429f710f7
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev
...
* changes:
[automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
TreeHugger Robot
80f5fd3836
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev
...
* changes:
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
SongFerng Wang
f970d63b3b
Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev
2022-09-28 19:45:33 +00:00
TreeHugger Robot
ee21072a5e
Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev
2022-09-28 16:48:10 +00:00
Milton Wu
2082b28cd4
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 659c5c18bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I746772c895d786ec4b6ae734df29598651053ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:18 +00:00
Milton Wu
7bc9d083a3
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: c5b9a0a392
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I56a72123e55bb8a51286b1980d114d3f6df4e08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:13 +00:00
TreeHugger Robot
600dcaa313
[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: 69c61a3a8e
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ib62140422f60dc4d3a7b5974191c1016a06e7755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:01 +00:00
Milton Wu
a78ad20f4c
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 1ec2b21d42
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I779f0ddfb01d49e952276c5df80885ea7a6f6414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:00 +00:00
Milton Wu
659c5c18bf
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Id253290f643928b0f923d08dfe28d5d4f4ce8127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:24:49 +00:00
Milton Wu
8da95c29a9
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: If075061207ed359f26ec3a597792329d77bc537a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:53:17 +00:00
Milton Wu
c5b9a0a392
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I73af48e2970b25de9cc00f6326123aea504b3c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:43:40 +00:00
TreeHugger Robot
69c61a3a8e
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I0dbeb8395a1be08c1c0c894c4b9300a735c6050a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:43:33 +00:00
Milton Wu
1ec2b21d42
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I2a898ea074fa01c6ffd8742e9d41762bed20fab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:43:32 +00:00
Milton Wu
5561341091
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:42:15 +00:00