From 7a9fff1590f73042c1e02126cbdfbdac40ff4c2c Mon Sep 17 00:00:00 2001 From: Omar Ismail Date: Wed, 27 Jul 2022 14:03:20 +0000 Subject: [PATCH 1/2] use android lib cancel --- .../main/res/layout/questionnaire_item_multi_select_dialog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml b/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml index 0c1d5f40c6..c0fceadc5f 100644 --- a/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml +++ b/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="@dimen/padding_half_size" - android:text="@string/cancel" + android:text="@android:string/cancel" /> Date: Tue, 9 Aug 2022 10:01:04 +0000 Subject: [PATCH 2/2] add locale flag --- kokoro/gcp_ubuntu/kokoro_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kokoro/gcp_ubuntu/kokoro_build.sh b/kokoro/gcp_ubuntu/kokoro_build.sh index d2b162b494..2d4d35b7d6 100755 --- a/kokoro/gcp_ubuntu/kokoro_build.sh +++ b/kokoro/gcp_ubuntu/kokoro_build.sh @@ -107,9 +107,9 @@ function device_tests() { --app demo/build/outputs/apk/androidTest/debug/demo-debug-androidTest.apk \ --test $lib_name/build/outputs/apk/androidTest/debug/$lib_name-debug-androidTest.apk \ --timeout 30m \ - --device model=Nexus6P,version=24 \ - --device model=Nexus6P,version=27 \ - --device model=Pixel2,version=30 \ + --device model=Nexus6P,version=24,locale=en_US \ + --device model=Nexus6P,version=27,locale=en_US \ + --device model=Pixel2,version=30,locale=en_US \ --environment-variables coverage=true,coverageFile="/sdcard/Download/coverage.ec" \ --directories-to-pull /sdcard/Download \ --results-bucket=$GCS_BUCKET \ @@ -125,7 +125,7 @@ function device_tests() { mkdir -p {datacapture,engine,workflow}/build/outputs/code_coverage/debugAndroidTest/connected/firebase for lib_name in "${lib_names[@]}"; do - gsutil -m cp -R gs://$GCS_BUCKET/$KOKORO_BUILD_ARTIFACTS_SUBDIR/firebase/$lib_name/Pixel2-30-en-portrait/**/coverage.ec \ + gsutil -m cp -R gs://$GCS_BUCKET/$KOKORO_BUILD_ARTIFACTS_SUBDIR/firebase/$lib_name/Pixel2-30-en_US-portrait/**/coverage.ec \ $lib_name/build/outputs/code_coverage/debugAndroidTest/connected/firebase done }