PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix fingerprint icon on pattern screen"

Browse Source
This commit is contained in:
Maurice Lam
2019-03-27 18:00:27 +00:00
committed by Android (Google) Code Review
parent 1d4362f9f0 9c2fae83a3
commit db24af6325
9 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/choose_lock_pattern.xml
View File

@@ -44,7 +44,7 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout-land/confirm_lock_pattern_normal.xml
View File

@@ -40,7 +40,7 @@
android:paddingBottom="24dp"> android:paddingBottom="24dp">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -49,7 +49,7 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -55,7 +55,7 @@
android:clipToPadding="false"> android:clipToPadding="false">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout-land/fingerprint_enroll_finish.xml
View File

@@ -45,7 +45,7 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout/choose_lock_pattern_common.xml
View File

@@ -41,7 +41,7 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -33,7 +33,7 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/suc_layout_icon" android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon" style="@style/SudGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -479,7 +479,7 @@ public class ChooseLockPattern extends SettingsActivity {
R.layout.choose_lock_pattern, container, false); R.layout.choose_lock_pattern, container, false);
layout.setHeaderText(getActivity().getTitle()); layout.setHeaderText(getActivity().getTitle());
if (getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) { if (getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) {
View iconView = layout.findViewById(R.id.suc_layout_icon); View iconView = layout.findViewById(R.id.sud_layout_icon);
if (iconView != null) { if (iconView != null) {
iconView.setVisibility(View.GONE); iconView.setVisibility(View.GONE);
} }

4
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
View File

@@ -32,7 +32,6 @@ import com.android.settingslib.testutils.DrawableTestHelper;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
@@ -93,7 +92,6 @@ public class ChooseLockPatternTest {
@Config(qualifiers = "sw400dp") @Config(qualifiers = "sw400dp")
@Test @Test
@Ignore("b/129342100")
public void fingerprintExtraSet_shouldDisplayFingerprintIcon() { public void fingerprintExtraSet_shouldDisplayFingerprintIcon() {
ChooseLockPattern activity = createActivity(true); ChooseLockPattern activity = createActivity(true);
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment) ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
@@ -109,7 +107,7 @@ public class ChooseLockPatternTest {
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment) ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
activity.getSupportFragmentManager().findFragmentById(R.id.main_content); activity.getSupportFragmentManager().findFragmentById(R.id.main_content);
View iconView = fragment.getView().findViewById(R.id.suc_layout_icon); View iconView = fragment.getView().findViewById(R.id.sud_layout_icon);
assertThat(iconView.getVisibility()).isEqualTo(View.GONE); assertThat(iconView.getVisibility()).isEqualTo(View.GONE);
} }