Fix RTL issue on fingerprint setup screens in landscape mode
1. Add an RTL layout dimension for enrolling page. 2. Handling device rotation landscape 270/90 degrees with layout dimension in LTR or RTL language. Bug: 237104754 Test: manually verified on Settings > Security > Face & Fingerprint Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page Test: make RunSettingsRoboTests ROBOTEST_FILTER= "com.android.settings.biometrics.fingerprint .FingerprintEnrollEnrollingTest" Change-Id: If4770d885d97c6bf4cfebefdf9cfa0b4ee0b995b
This commit is contained in:
@@ -33,11 +33,15 @@
|
|||||||
<!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
|
<!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
|
||||||
See layouts/fingerprint_enroll_enrolling_base.xml. -->
|
See layouts/fingerprint_enroll_enrolling_base.xml. -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:id="@+id/layout_container"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginStart="?attr/sudMarginStart"
|
android:layout_marginStart="?attr/sudMarginStart"
|
||||||
|
android:layout_marginEnd="@dimen/enroll_margin_end"
|
||||||
android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
|
android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
|
||||||
|
android:paddingStart="@dimen/enroll_padding_start"
|
||||||
|
android:paddingEnd="@dimen/enroll_padding_end"
|
||||||
android:clipChildren="false"
|
android:clipChildren="false"
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
26
res/values-ldltr/dimens.xml
Executable file
26
res/values-ldltr/dimens.xml
Executable file
@@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2022 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources>
|
||||||
|
<!-- Biometrics UDFPS enroll landscape dimensions-->
|
||||||
|
<dimen name="enroll_padding_start">0dp</dimen>
|
||||||
|
<dimen name="enroll_padding_end">0dp</dimen>
|
||||||
|
<dimen name="enroll_margin_end">0dp</dimen>
|
||||||
|
|
||||||
|
<dimen name="rotation_90_enroll_padding_start">-290dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_padding_end">108dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_margin_end">150dp</dimen>
|
||||||
|
</resources>
|
26
res/values-ldrtl/dimens.xml
Executable file
26
res/values-ldrtl/dimens.xml
Executable file
@@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2022 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources>
|
||||||
|
<!-- Biometrics UDFPS enroll landscape RTL dimensions-->
|
||||||
|
<dimen name="enroll_padding_start">-440dp</dimen>
|
||||||
|
<dimen name="enroll_padding_end">320dp</dimen>
|
||||||
|
<dimen name="enroll_margin_end">150dp</dimen>
|
||||||
|
|
||||||
|
<dimen name="rotation_90_enroll_padding_start">20dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_padding_end">0dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_margin_end">20dp</dimen>
|
||||||
|
</resources>
|
@@ -494,6 +494,14 @@
|
|||||||
<dimen name="sims_select_margin_bottom">24dp</dimen>
|
<dimen name="sims_select_margin_bottom">24dp</dimen>
|
||||||
<dimen name="sims_select_margin_top">8dp</dimen>
|
<dimen name="sims_select_margin_top">8dp</dimen>
|
||||||
|
|
||||||
|
<!-- Biometrics UDFPS enroll default dimensions-->
|
||||||
|
<dimen name="enroll_padding_start">0dp</dimen>
|
||||||
|
<dimen name="enroll_padding_end">0dp</dimen>
|
||||||
|
<dimen name="enroll_margin_end">0dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_padding_start">0dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_padding_end">0dp</dimen>
|
||||||
|
<dimen name="rotation_90_enroll_margin_end">0dp</dimen>
|
||||||
|
|
||||||
<!-- QR code picture size -->
|
<!-- QR code picture size -->
|
||||||
<dimen name="qrcode_preview_margin">40dp</dimen>
|
<dimen name="qrcode_preview_margin">40dp</dimen>
|
||||||
<dimen name="qrcode_preview_radius">30dp</dimen>
|
<dimen name="qrcode_preview_radius">30dp</dimen>
|
||||||
|
@@ -47,6 +47,7 @@ import android.view.accessibility.AccessibilityEvent;
|
|||||||
import android.view.accessibility.AccessibilityManager;
|
import android.view.accessibility.AccessibilityManager;
|
||||||
import android.view.animation.AnimationUtils;
|
import android.view.animation.AnimationUtils;
|
||||||
import android.view.animation.Interpolator;
|
import android.view.animation.Interpolator;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
@@ -64,10 +65,12 @@ import com.airbnb.lottie.LottieAnimationView;
|
|||||||
import com.google.android.setupcompat.template.FooterBarMixin;
|
import com.google.android.setupcompat.template.FooterBarMixin;
|
||||||
import com.google.android.setupcompat.template.FooterButton;
|
import com.google.android.setupcompat.template.FooterButton;
|
||||||
import com.google.android.setupcompat.util.WizardManagerHelper;
|
import com.google.android.setupcompat.util.WizardManagerHelper;
|
||||||
|
import com.google.android.setupdesign.GlifLayout;
|
||||||
|
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
import java.lang.annotation.RetentionPolicy;
|
import java.lang.annotation.RetentionPolicy;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Activity which handles the actual enrolling for fingerprint.
|
* Activity which handles the actual enrolling for fingerprint.
|
||||||
@@ -168,13 +171,37 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
|
|||||||
mAccessibilityManager = getSystemService(AccessibilityManager.class);
|
mAccessibilityManager = getSystemService(AccessibilityManager.class);
|
||||||
mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
|
mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
|
||||||
|
|
||||||
|
final boolean isLayoutRtl = (TextUtils.getLayoutDirectionFromLocale(
|
||||||
|
Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL);
|
||||||
listenOrientationEvent();
|
listenOrientationEvent();
|
||||||
|
|
||||||
if (mCanAssumeUdfps) {
|
if (mCanAssumeUdfps) {
|
||||||
if (BiometricUtils.isReverseLandscape(getApplicationContext())) {
|
switch(getApplicationContext().getDisplay().getRotation()) {
|
||||||
setContentView(R.layout.udfps_enroll_enrolling_land);
|
case Surface.ROTATION_90:
|
||||||
} else {
|
final GlifLayout layout = (GlifLayout) getLayoutInflater().inflate(
|
||||||
setContentView(R.layout.udfps_enroll_enrolling);
|
R.layout.udfps_enroll_enrolling, null, false);
|
||||||
|
final LinearLayout layoutContainer = layout.findViewById(
|
||||||
|
R.id.layout_container);
|
||||||
|
final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
|
||||||
|
LinearLayout.LayoutParams.MATCH_PARENT,
|
||||||
|
LinearLayout.LayoutParams.MATCH_PARENT);
|
||||||
|
|
||||||
|
lp.setMarginEnd((int) getResources().getDimension(
|
||||||
|
R.dimen.rotation_90_enroll_margin_end));
|
||||||
|
layoutContainer.setPaddingRelative((int) getResources().getDimension(
|
||||||
|
R.dimen.rotation_90_enroll_padding_start), 0, isLayoutRtl
|
||||||
|
? 0 : (int) getResources().getDimension(
|
||||||
|
R.dimen.rotation_90_enroll_padding_end), 0);
|
||||||
|
layoutContainer.setLayoutParams(lp);
|
||||||
|
setContentView(layout, lp);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Surface.ROTATION_0:
|
||||||
|
case Surface.ROTATION_180:
|
||||||
|
case Surface.ROTATION_270:
|
||||||
|
default:
|
||||||
|
setContentView(R.layout.udfps_enroll_enrolling);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
|
setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user