Add minor UI updates to screen lock.

This commit is contained in:
Michelle Tang 2024-08-12 16:22:43 -07:00 committed by GitHub
parent 68c7ce5823
commit 08d8564c00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 34 additions and 7 deletions

View file

@ -63,6 +63,7 @@ public abstract class PassphraseActivity extends BaseActivity {
if (nextIntent != null) { if (nextIntent != null) {
try { try {
startActivity(nextIntent); startActivity(nextIntent);
overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
} catch (java.lang.SecurityException e) { } catch (java.lang.SecurityException e) {
Log.w(TAG, "Access permission not passed from PassphraseActivity, retry sharing."); Log.w(TAG, "Access permission not passed from PassphraseActivity, retry sharing.");
} }

View file

@ -387,6 +387,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
@Override @Override
public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
Log.i(TAG, "onAuthenticationSucceeded"); Log.i(TAG, "onAuthenticationSucceeded");
lockScreenButton.setOnClickListener(null);
unlockView.addAnimatorListener(new AnimationCompleteListener() { unlockView.addAnimatorListener(new AnimationCompleteListener() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {

View file

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="24dp"
android:viewportWidth="12"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6 6.75c0.9 0 1.63-0.73 1.63-1.63C7.63 4.22 6.9 3.5 6 3.5c-0.9 0-1.63 0.73-1.63 1.63 0 0.9 0.73 1.62 1.63 1.62Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M7.63 12c0 0.9-0.73 1.63-1.63 1.63-0.9 0-1.63-0.73-1.63-1.63 0-0.9 0.73-1.63 1.63-1.63 0.9 0 1.63 0.73 1.63 1.63Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M7.63 18.88c0 0.9-0.73 1.62-1.63 1.62-0.9 0-1.63-0.73-1.63-1.63 0-0.9 0.73-1.62 1.63-1.62 0.9 0 1.63 0.73 1.63 1.63Z"/>
</vector>

View file

@ -7,6 +7,7 @@
android:id="@+id/prompt_layout" android:id="@+id/prompt_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/signal_colorSurface"
android:orientation="vertical" android:orientation="vertical"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
@ -19,12 +20,14 @@
android:layout_marginTop="20dp" /> android:layout_marginTop="20dp" />
<LinearLayout <LinearLayout
android:id="@+id/unlock_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:paddingBottom="36dp"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center"> android:gravity="center">
@ -32,13 +35,14 @@
android:id="@+id/unlock_view" android:id="@+id/unlock_view"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_marginBottom="4dp"
app:lottie_rawRes="@raw/lottie_unlock" /> app:lottie_rawRes="@raw/lottie_unlock" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/prompt_passphrase_activity__unlock_signal" android:text="@string/prompt_passphrase_activity__unlock_signal"
style="@style/Signal.Text.Headline.Medium" /> style="@style/Signal.Text.HeadlineMedium" />
<RelativeLayout android:id="@+id/password_auth_container" <RelativeLayout android:id="@+id/password_auth_container"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -113,6 +117,9 @@
style="@style/Signal.Text.BodyMedium" style="@style/Signal.Text.BodyMedium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/unlock_container"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintVertical_bias=".65"
app:layout_constraintBottom_toTopOf="@id/lock_screen_button" app:layout_constraintBottom_toTopOf="@id/lock_screen_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -131,8 +138,9 @@
android:text="@string/prompt_passphrase_activity__unlock" android:text="@string/prompt_passphrase_activity__unlock"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/learn_more_text"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="80dp" android:layout_marginBottom="16dp"
tools:visibility="visible"/> tools:visibility="visible"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -270,7 +270,7 @@
</style> </style>
<style name="Signal.Toolbar.Overflow.Light"> <style name="Signal.Toolbar.Overflow.Light">
<item name="srcCompat">@drawable/ic_more_vert_24</item> <item name="srcCompat">@drawable/symbol_more_vertical</item>
<item name="android:src">@null</item> <item name="android:src">@null</item>
<item name="android:tint">@color/signal_icon_tint_primary</item> <item name="android:tint">@color/signal_icon_tint_primary</item>
</style> </style>

View file

@ -97,8 +97,8 @@
<style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar"> <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item> <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
<item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item> <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item>
<item name="android:statusBarColor" tools:ignore="NewApi">@color/login_top_background</item> <item name="android:statusBarColor" tools:ignore="NewApi">@color/signal_colorSurface</item>
<item name="android:windowTranslucentNavigation">true</item> <item name="android:navigationBarColor">@color/signal_colorSurface</item>
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
@ -114,8 +114,9 @@
<style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat"> <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item> <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
<item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item> <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="27">default</item>
<item name="android:statusBarColor" tools:ignore="NewApi">@color/login_top_background</item> <item name="android:statusBarColor" tools:ignore="NewApi">@color/signal_colorSurface</item>
<item name="android:windowTranslucentNavigation">true</item> <item name="android:navigationBarColor">@color/signal_colorSurface</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>