From dcd37f71d1fa9eb5cd2b55123753ad82ef160c6e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 19 Mar 2021 14:27:10 -0300 Subject: [PATCH] Turn splash screen duration into a resource variable so screenshot tests can define a different duration --- .../briar/android/splash/SplashScreenActivity.java | 4 +++- briar-android/src/main/res/values/attrs.xml | 2 ++ briar-android/src/screenshotDebug/res/values/attrs.xml | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 briar-android/src/screenshotDebug/res/values/attrs.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java index 85aa5bb42..79e537d29 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java @@ -61,6 +61,8 @@ public class SplashScreenActivity extends BaseActivity { startNextActivity(ENTRY_ACTIVITY); finish(); } else { + int duration = + getResources().getInteger(R.integer.splashScreenDuration); new Handler().postDelayed(() -> { if (currentTimeMillis() >= EXPIRY_DATE) { LOG.info("Expired"); @@ -69,7 +71,7 @@ public class SplashScreenActivity extends BaseActivity { startNextActivity(ENTRY_ACTIVITY); } supportFinishAfterTransition(); - }, 500); + }, duration); } } diff --git a/briar-android/src/main/res/values/attrs.xml b/briar-android/src/main/res/values/attrs.xml index 51e0b887f..e02416ad3 100644 --- a/briar-android/src/main/res/values/attrs.xml +++ b/briar-android/src/main/res/values/attrs.xml @@ -3,6 +3,8 @@ @android:integer/config_mediumAnimTime + 500 + diff --git a/briar-android/src/screenshotDebug/res/values/attrs.xml b/briar-android/src/screenshotDebug/res/values/attrs.xml new file mode 100644 index 000000000..e39053ba1 --- /dev/null +++ b/briar-android/src/screenshotDebug/res/values/attrs.xml @@ -0,0 +1,6 @@ + + + + 7500 + +