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

Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev

Browse Source
This commit is contained in:
Udam Saini
2016-02-11 23:32:16 +00:00
committed by Android (Google) Code Review
parent 4ba3cbbe0e 73512ee684
commit 6b00d3fe40
8 changed files with 306 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/SetupChooseLockGeneric.java
View File

@@ -25,16 +25,12 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.fingerprint.SetupSkipDialog;
import com.android.setupwizardlib.SetupWizardLayout;
import com.android.setupwizardlib.SetupWizardPreferenceLayout;
import com.android.setupwizardlib.view.NavigationBar;
/**
@@ -75,9 +71,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
SetupWizardUtils.setImmersiveMode(getActivity());
SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
R.dimen.suw_items_text_divider_inset));
SetupWizardLayout layout = (SetupWizardLayout) view;
final NavigationBar navigationBar = layout.getNavigationBar();
Button nextButton = navigationBar.getNextButton();
nextButton.setText(null);
@@ -92,9 +86,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
layout.setHeaderText(R.string.lock_settings_picker_title);
}
// Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
// PreferenceFragment.
setDivider(null);
}
@Override
@@ -124,13 +115,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
// activity will be resumed to foreground.
}
@Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
Bundle savedInstanceState) {
SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) parent;
return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
}
/***
* Disables preferences that are less secure than required quality and shows only secure
* screen lock options here.