Fix the “screen lock option” and password restriction view are
in the wrong position on PIN/Password/Pattern in the landscape mode. 1. Move the description position under the GlifLayout header 2. Move the position "Screen lock options" button under the GlifLayout header Bug: 272676038 Bug: 285271342 Test: manully test with reproducible steps: STEPS TO REPRODUCE: 1. Go through the setup flow 2. Continue steps until “set pin” page 3. The “screen lock option” is in the wrong position Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings .password.SetupChooseLockPasswordTest" Change-Id: I24464e6b7e93f20abbeb59426919ed7fec5c7cbb
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.password;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -31,9 +32,12 @@ import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirem
|
||||
*/
|
||||
public class PasswordRequirementAdapter extends
|
||||
RecyclerView.Adapter<PasswordRequirementViewHolder> {
|
||||
private String[] mRequirements;
|
||||
|
||||
public PasswordRequirementAdapter() {
|
||||
private String[] mRequirements;
|
||||
private Context mContext;
|
||||
|
||||
public PasswordRequirementAdapter(Context context) {
|
||||
mContext = context;
|
||||
setHasStableIds(true);
|
||||
}
|
||||
|
||||
@@ -61,7 +65,12 @@ public class PasswordRequirementAdapter extends
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(PasswordRequirementViewHolder holder, int position) {
|
||||
final int fontSize = mContext.getResources().getDimensionPixelSize(
|
||||
R.dimen.password_requirement_font_size);
|
||||
holder.mDescriptionText.setText(mRequirements[position]);
|
||||
holder.mDescriptionText.setTextAppearance(R.style.ScreenLockPasswordHintTextFontStyle);
|
||||
holder.mDescriptionText.setTextSize(fontSize / mContext.getResources()
|
||||
.getDisplayMetrics().scaledDensity);
|
||||
}
|
||||
|
||||
public static class PasswordRequirementViewHolder extends RecyclerView.ViewHolder {
|
||||
|
Reference in New Issue
Block a user