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

Merge "Update lock pattern for landscape" into sc-dev

Browse Source
This commit is contained in:
Mill Chen
2021-03-30 07:24:17 +00:00
committed by Android (Google) Code Review
parent 52bfe9c50a 0cbd13d0df
commit ad8a4029c3
6 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-land/confirm_lock_pattern.xml
View File

@@ -48,13 +48,13 @@
android:src="@drawable/ic_enterprise" /> android:src="@drawable/ic_enterprise" />
<TextView <TextView
android:id="@+id/headerText" android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle" style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/sud_layout_description" android:id="@+id/sud_layout_subtitle"
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

@@ -48,14 +48,14 @@
android:src="@drawable/ic_lock" /> android:src="@drawable/ic_lock" />
<TextView <TextView
android:id="@+id/headerText" android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle" style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:id="@+id/sud_layout_description" android:id="@+id/sud_layout_subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart" android:layout_marginStart="?attr/sudMarginStart"

4
res/layout/confirm_lock_pattern_base.xml
View File

@@ -42,13 +42,13 @@
android:src="@drawable/ic_enterprise" /> android:src="@drawable/ic_enterprise" />
<TextView <TextView
android:id="@+id/headerText" android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle" style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/sud_layout_description" android:id="@+id/sud_layout_subtitle"
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -41,14 +41,14 @@
android:src="@drawable/ic_lock" /> android:src="@drawable/ic_lock" />
<TextView <TextView
android:id="@+id/headerText" android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle" style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:id="@+id/sud_layout_description" android:id="@+id/sud_layout_subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart" android:layout_marginStart="?attr/sudMarginStart"

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

@@ -32,6 +32,7 @@ import android.util.Pair;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Surface;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ScrollView; import android.widget.ScrollView;
@@ -508,6 +509,12 @@ public class ChooseLockPattern extends SettingsActivity {
Bundle savedInstanceState) { Bundle savedInstanceState) {
final GlifLayout layout = (GlifLayout) inflater.inflate( final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.choose_lock_pattern, container, false); R.layout.choose_lock_pattern, container, false);
switch(getContext().getDisplay().getRotation()) {
case Surface.ROTATION_90:
case Surface.ROTATION_270:
layout.setLandscapeHeaderAreaVisible(false /* visible */);
break;
}
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.sud_layout_icon); View iconView = layout.findViewById(R.id.sud_layout_icon);

36
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -28,6 +28,7 @@ import android.os.UserManager;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Surface;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
@@ -45,6 +46,8 @@ import com.android.settingslib.animation.AppearAnimationCreator;
import com.android.settingslib.animation.AppearAnimationUtils; import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils; import com.android.settingslib.animation.DisappearAnimationUtils;
import com.google.android.setupdesign.GlifLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -90,8 +93,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
private boolean mDisappearing = false; private boolean mDisappearing = false;
private CountDownTimer mCountdownTimer; private CountDownTimer mCountdownTimer;
private TextView mHeaderTextView; private GlifLayout mGlifLayout;
private TextView mDetailsTextView;
// caller-supplied text for various prompts // caller-supplied text for various prompts
private CharSequence mHeaderText; private CharSequence mHeaderText;
@@ -117,9 +119,14 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
: R.layout.confirm_lock_pattern, : R.layout.confirm_lock_pattern,
container, container,
false); false);
mHeaderTextView = (TextView) view.findViewById(R.id.headerText); mGlifLayout = view.findViewById(R.id.setup_wizard_layout);
switch(getContext().getDisplay().getRotation()) {
case Surface.ROTATION_90:
case Surface.ROTATION_270:
mGlifLayout.setLandscapeHeaderAreaVisible(false /* visible */);
break;
}
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern); mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mDetailsTextView = (TextView) view.findViewById(R.id.sud_layout_description);
mErrorTextView = (TextView) view.findViewById(R.id.errorText); mErrorTextView = (TextView) view.findViewById(R.id.errorText);
mIsManagedProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId); mIsManagedProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId);
@@ -177,7 +184,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
return (float)(numRows - row) / numRows; return (float)(numRows - row) / numRows;
} }
}); });
setAccessibilityTitle(mHeaderTextView.getText()); setAccessibilityTitle(mGlifLayout.getHeaderText());
mCredentialCheckResultTracker = (CredentialCheckResultTracker) getFragmentManager() mCredentialCheckResultTracker = (CredentialCheckResultTracker) getFragmentManager()
.findFragmentByTag(FRAGMENT_TAG_CHECK_LOCK_RESULT); .findFragmentByTag(FRAGMENT_TAG_CHECK_LOCK_RESULT);
@@ -242,13 +249,13 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
@Override @Override
public void prepareEnterAnimation() { public void prepareEnterAnimation() {
super.prepareEnterAnimation(); super.prepareEnterAnimation();
mHeaderTextView.setAlpha(0f); mGlifLayout.getHeaderTextView().setAlpha(0f);
mCancelButton.setAlpha(0f); mCancelButton.setAlpha(0f);
if (mForgotButton != null) { if (mForgotButton != null) {
mForgotButton.setAlpha(0f); mForgotButton.setAlpha(0f);
} }
mLockPatternView.setAlpha(0f); mLockPatternView.setAlpha(0f);
mDetailsTextView.setAlpha(0f); mGlifLayout.getDescriptionTextView().setAlpha(0f);
} }
private int getDefaultDetails() { private int getDefaultDetails() {
@@ -269,8 +276,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
private Object[][] getActiveViews() { private Object[][] getActiveViews() {
ArrayList<ArrayList<Object>> result = new ArrayList<>(); ArrayList<ArrayList<Object>> result = new ArrayList<>();
result.add(new ArrayList<>(Collections.singletonList(mHeaderTextView))); result.add(new ArrayList<>(Collections.singletonList(mGlifLayout.getHeaderTextView())));
result.add(new ArrayList<>(Collections.singletonList(mDetailsTextView))); result.add(new ArrayList<>(
Collections.singletonList(mGlifLayout.getDescriptionTextView())));
if (mCancelButton.getVisibility() == View.VISIBLE) { if (mCancelButton.getVisibility() == View.VISIBLE) {
result.add(new ArrayList<>(Collections.singletonList(mCancelButton))); result.add(new ArrayList<>(Collections.singletonList(mCancelButton)));
} }
@@ -306,14 +314,14 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
switch (stage) { switch (stage) {
case NeedToUnlock: case NeedToUnlock:
if (mHeaderText != null) { if (mHeaderText != null) {
mHeaderTextView.setText(mHeaderText); mGlifLayout.setHeaderText(mHeaderText);
} else { } else {
mHeaderTextView.setText(getDefaultHeader()); mGlifLayout.setHeaderText(getDefaultHeader());
} }
if (mDetailsText != null) { if (mDetailsText != null) {
mDetailsTextView.setText(mDetailsText); mGlifLayout.setDescriptionText(mDetailsText);
} else { } else {
mDetailsTextView.setText(getDefaultDetails()); mGlifLayout.setDescriptionText(getDefaultDetails());
} }
mErrorTextView.setText(""); mErrorTextView.setText("");
updateErrorMessage( updateErrorMessage(
@@ -341,7 +349,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
// Always announce the header for accessibility. This is a no-op // Always announce the header for accessibility. This is a no-op
// when accessibility is disabled. // when accessibility is disabled.
mHeaderTextView.announceForAccessibility(mHeaderTextView.getText()); mGlifLayout.getHeaderTextView().announceForAccessibility(mGlifLayout.getHeaderText());
} }
private int getDefaultHeader() { private int getDefaultHeader() {