diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java index 64c313941..ab1a79b4a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java @@ -23,6 +23,7 @@ import static android.view.View.VISIBLE; import static android.widget.Toast.LENGTH_LONG; import static org.briarproject.android.dontkillmelib.DozeUtils.getDozeWhitelistingIntent; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_DOZE_WHITELISTING; +import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen; import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog; @MethodsNotNullByDefault @@ -79,6 +80,12 @@ public class DozeFragment extends SetupFragment return v; } + @Override + public void onStart() { + super.onStart(); + hideViewOnSmallScreen(requireView().findViewById(R.id.logo)); + } + @Override public String getUniqueTag() { return TAG; diff --git a/briar-android/src/main/res/layout/fragment_setup_doze.xml b/briar-android/src/main/res/layout/fragment_setup_doze.xml index 5a94c3592..19ea23ed2 100644 --- a/briar-android/src/main/res/layout/fragment_setup_doze.xml +++ b/briar-android/src/main/res/layout/fragment_setup_doze.xml @@ -11,20 +11,36 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_activity_vertical"> + + + app:layout_constraintTop_toBottomOf="@+id/logo" /> @@ -34,6 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/margin_large" + app:layout_constraintBottom_toTopOf="@+id/xiaomiRecentAppsView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/huaweiProtectedAppsView" /> @@ -43,6 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/margin_large" + app:layout_constraintBottom_toTopOf="@+id/xiaomiLockAppsView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/huaweiAppLaunchView" /> @@ -52,6 +70,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/margin_large" + app:layout_constraintBottom_toTopOf="@+id/next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/xiaomiRecentAppsView" /> @@ -66,8 +85,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/xiaomiLockAppsView" - app:layout_constraintVertical_bias="1.0" tools:enabled="true" />