PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,523 Commits 1 Branch 0 Tags
1325de7875b34d6ec8056d3c15c20afcc294c927
Commit Graph

44564 Commits

Author SHA1 Message Date
YK Hung
3836a8a8de Merge "Fix errorprone warnings that should be errors" 2022-11-23 02:07:10 +00:00
Steve Elliott
81fc1b0b4d Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 23:05:49 +00:00
Steve Elliott
fece948623 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev 2022-11-22 22:50:10 +00:00
Hao Dong
a538195c3c Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779

Change-Id: Id63f4f017a8e2af8ceb03dfbb2f662026839b9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 17:46:29 +00:00
Hao Dong
a01a1857ec Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev 2022-11-22 17:10:49 +00:00
Bonian Chen
68c294df24 [Settings] Additional route for dismiss activity dialog 
Previous design dismiss an activity dialog through Intent would lead to a pair of creating and finishing activity. The task switch during the creating and finishing may introduce some side effect to the other apps.

This change tried to add additional route to avoid from dismiss through Intent
but sending an async close request to that specific dialog (if available).

Bug: 236956105
Test: local, auto testing
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: I88a6c0632c1be906b310a10c154149c319d34759
 2022-11-22 16:04:40 +00:00
Bonian Chen
8f936c0bdb Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b am: d33fbde071 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Idc1ee6fcf8fc403ed9592adf34417ebe2b15b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:28:07 +00:00
Bonian Chen
4e1a1e65b9 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 am: e4fbf9d941 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I1bcbe2f57013ace3641937897ae2d0d8b64e2f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:28:05 +00:00
Bonian Chen
52bae42964 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720 am: 2decf2ae45 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I57d2afd3af39506a35ea369ab561d02d039884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:28:03 +00:00
Bonian Chen
d33fbde071 Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:33 +00:00
Bonian Chen
e4fbf9d941 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I76eae77bcd825e7fa5fbc12b46eb72a7f9ddfd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:31 +00:00
Bonian Chen
2decf2ae45 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I91a72f38cc22583202c9c707463735d3f436aac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 14:08:29 +00:00
Bonian Chen
a1c1bd0f81 Revert "[Settings] configuration for hidding SIM provider UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d
 2022-11-22 11:59:26 +00:00
Bonian Chen
3b7d0d2e17 Revert "[Settings] configuration for hidding SIM remove UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
 2022-11-22 11:59:15 +00:00
Bonian Chen
8e98f5a852 Revert "[Settings] configuration for hidding SIM settings UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I646d664b83d3db12cca81f53f7f5cd82a38e34d0
 2022-11-22 11:59:02 +00:00
Bonian Chen
ead8a35720 Revert "[Settings] configuration for hidding SIM lock UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: Ie157c9d85b5cea9ded8c4b7928a10e7ae401ab09
 2022-11-22 11:58:48 +00:00
Bonian Chen
26aa2414a0 Revert "[Settings] configuration for hidding SIM notification UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: Ib366c3fca7433e58d1925f27af11a794afb3ca00
 2022-11-22 11:57:34 +00:00
Bonian Chen
0a4295d688 Revert "[Settings] configuration for hidding SIM related UI" 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0
 2022-11-22 11:52:05 +00:00
Bonian Chen
135392ec6d Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 am: 0a733a9ed9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

Change-Id: I0ed0a83df84bdc76991778f8d37f69ee49872b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:39 +00:00
Bonian Chen
e71a029160 Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a am: 68a039754a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467

Change-Id: Ie6a0f43399c016fadc058e2d161f1046b8721058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:43:37 +00:00
Bonian Chen
0a733a9ed9 Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

Change-Id: I4950a96f8637c06eadcf9f1248dc56b129dfca36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:15 +00:00
Bonian Chen
68a039754a Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467

Change-Id: I1b3e4fc3208e4476e81030319cec4b5705190c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:14 +00:00
Bonian Chen
f901e617c1 Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465

Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:19:09 +00:00
Bonian Chen
2a98e2a4fe Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463

Change-Id: If39c1f00449571d803eeeff89bb69ff2a789382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 09:18:59 +00:00
Bonian Chen
769d773997 Merge "[Settings] configuration for hidding SIM settings UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
889c81f77a Merge "[Settings] configuration for hidding SIM remove UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
f7ec7e66c4 Merge "[Settings] configuration for hidding SIM provider UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
1ab73b934b Merge "[Settings] configuration for hidding SIM lock UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
56ff3fd99a Merge "[Settings] configuration for hidding SIM notification UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
d40fd7c597 Merge "[Settings] configuration for hidding SIM related UI" 2022-11-22 08:51:53 +00:00
TreeHugger Robot
6c7910557e Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460

Change-Id: Idb43b7a13130da5c2aa84df780d42aeca0771b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 03:17:16 +00:00
TreeHugger Robot
6f908bae6f Merge "Adds settings item for quick affordances." into tm-qpr-dev 2022-11-22 02:59:15 +00:00
Alejandro Nijamkin
01df2b4ee2 Adds settings item for quick affordances. 
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.

Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen

Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
 2022-11-21 16:42:45 -08:00
Steve Elliott
30ccc43ae1 Revert^2 "Add configuration for defaulting notification behavior" 
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
 2022-11-21 15:16:40 +00:00
Bonian Chen
f01cea0236 Merge "[Settings] Code Refactor" am: 8ae657bd80 am: f6d9536922 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I5b90defe3741e720280fe026ab45f57b013fa640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-21 10:36:53 +00:00
Bonian Chen
f6d9536922 Merge "[Settings] Code Refactor" am: 8ae657bd80 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I4efad57d509e79938a5558f09b6154d898504b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-21 10:11:28 +00:00
Weng Su
d46c3848a9 Keep "Resetting your internet" when screen rotates 
- The fragment of Internet Settings will be destroyed and recreated when screen rotates

- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed

- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary

Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
 2022-11-21 07:55:22 +00:00
Cole Faust
37cfdc7536 Fix errorprone warnings that should be errors 
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Merged-In: I21aa58ebc02327849ed2161dbbafcdc806c007f2
Change-Id: I2fbc9701a4ad1caa264e0b22e02fd0dab310eabd
 2022-11-19 22:42:42 +00:00
Yanting Yang
8c5a1d4ab2 Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev am: 06125115a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20514510

Change-Id: If667eaba37c2bf6417053a9477187009ce809efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-19 19:16:40 +00:00
Yi-Ling Chuang
2dd4058e37 Remove BatteryFixSlice as it's not used am: 2f80e073d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20514509

Change-Id: I536b1e852ddcf5154c8aeb64ae755156330aa9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-19 19:16:34 +00:00
Yanting Yang
06125115a0 Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev 2022-11-19 18:33:05 +00:00
Bonian Chen
c3028291ed [Settings] Code Refactor 
Adjust code structure for maintainance.

Bug: 259611847
Test: auto test
Change-Id: I1fab8d0347f64c01ee768e4bb9ea838a9e7ad4fc
 2022-11-19 13:14:07 +00:00
Hao Dong
8c5d8e694a Use the internal max faces number to check enrolled. 
Test: manually tested on device
Test: robotest for FaceEnrollIntroductionTest
Bug: 243759589
Change-Id: I193c7b7c49f884541bd5d8282d15bf69e46f3392
Merged-In: I193c7b7c49f884541bd5d8282d15bf69e46f3392
(cherry picked from commit b4000fb226)
 2022-11-18 20:43:38 +00:00
Bonian Chen
81e86e8d5d Merge "[Settings] Code Refactor" am: bafd49d604 am: c31caafb5a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239

Change-Id: I8dbda9c6b40fb8207b81b30e89e464eea87a06bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-18 12:31:54 +00:00
Bonian Chen
c31caafb5a Merge "[Settings] Code Refactor" am: bafd49d604 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308239

Change-Id: Iad870d2df6f9ecb2ff207b8753288da6446e218a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-18 12:06:39 +00:00
Yi-Ling Chuang
2f80e073d0 Remove BatteryFixSlice as it's not used 
The BatteryFixSlice hasn't been used for a while, and it's introducing
memory leaks due to a design change at the framework's end. Hence,
remove it.

Bug: 245385410
Test: robotests
Change-Id: I517cab71a32613d5cb5fcd3beb991a24926a2902
Merged-In: I517cab71a32613d5cb5fcd3beb991a24926a2902
(cherry picked from commit e3fcf1f082)
 2022-11-18 10:58:42 +00:00
Wesley Wang
9a539a46d1 Invoke close() method for BatteryUsageStats to close cursor window 
- Invoke close() method for BatteryUsageStats to close cursor window,
   avoid OOM.

Bug: 245385410
Test: make SettingsRoboTests
Change-Id: I68f36a42a33d2546cb191cec88f5431e24dd5b84
(cherry picked from commit f164be387e)
 2022-11-18 10:19:07 +00:00
Bonian Chen
e1f641a130 [Settings] Code Refactor 
Adjust code structure for maintainance.

Bug: 259611847
Test: auto test
Change-Id: I6710aa814441c0858c712f416ffddde44081d4d1
 2022-11-18 08:36:53 +00:00
Joshua Mccloskey
db1ec87cb6 Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev am: 1d04eb6eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20488559

Change-Id: I85f20ce7a8c0d4973cdcb42744bb7d04b9a7b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 17:25:44 +00:00
Joshua Mccloskey
1d04eb6eb7 Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev 2022-11-17 16:56:48 +00:00