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

Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732

Change-Id: Ib149edd918076d46f98d657169e13bc2d34cdef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2022-07-26 01:17:02 +00:00
committed by Automerger Merge Worker
parent 6a8f459e6c 483c9b7206
commit 008f70c249
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/choose_lock_pattern_common.xml
View File

@@ -36,16 +36,6 @@
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp"> android:paddingRight="0dp">
<TextView
android:id="@+id/sud_layout_description"
android:text="@string/lockpassword_choose_your_pattern_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minLines="4"
android:paddingStart="?attr/sudMarginStart"
android:paddingEnd="?attr/sudMarginEnd"/>
<TextView <TextView
android:id="@+id/headerText" android:id="@+id/headerText"
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"

3
src/com/android/settings/password/SetupChooseLockPattern.java
View File

@@ -143,7 +143,8 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
} }
final GlifLayout layout = getActivity().findViewById(R.id.setup_wizard_layout); final GlifLayout layout = getActivity().findViewById(R.id.setup_wizard_layout);
layout.setDescriptionText(""); layout.setDescriptionText(
getString(R.string.lockpassword_choose_your_pattern_description));
} }
@Override @Override

13
tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
View File

@@ -27,6 +27,7 @@ import android.content.pm.PackageManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@@ -192,6 +193,18 @@ public class SetupChooseLockPatternTest {
.isEqualTo(application.getString(R.string.lockpattern_retry_button_text)); .isEqualTo(application.getString(R.string.lockpattern_retry_button_text));
} }
@Test
public void createActivity_patternDescription_shouldBeShown() {
PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
final TextView patternDescription =
layout.findViewById(R.id.sud_layout_subtitle);
assertThat(patternDescription.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(patternDescription.getText()).isEqualTo(
application.getString(R.string.lockpassword_choose_your_pattern_description));
}
private ChooseLockPatternFragment findFragment(FragmentActivity activity) { private ChooseLockPatternFragment findFragment(FragmentActivity activity) {
return (ChooseLockPatternFragment) return (ChooseLockPatternFragment)
activity.getSupportFragmentManager().findFragmentById(R.id.main_content); activity.getSupportFragmentManager().findFragmentById(R.id.main_content);