Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd17eb43 authored by Udam Saini's avatar Udam Saini
Browse files

Uses recycler view to add a line at the top in the intro 

Also, adjusts the divider insets as appropriate for settings and setup
wizard.

bug:27591940
Change-Id: I7aeefd6d1bfe94c97f686e81bc045d31e878655f
parent dccc582d

res/layout/fingerprint_enroll_introduction.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    limitations under the License

-->



<com.android.setupwizardlib.SetupWizardItemsLayout

<com.android.setupwizardlib.SetupWizardRecyclerLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

src/com/android/settings/fingerprint/FingerprintEnrollBase.java

+1 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity 
    }



    protected void setHeaderText(int resId, boolean force) {

        TextView layoutTitle = (TextView) getSetupWizardLayout().findViewById(

                R.id.suw_layout_title);

        TextView layoutTitle = getSetupWizardLayout().getHeaderTextView();

        CharSequence previousTitle = layoutTitle.getText();

        CharSequence title = getText(resId);

        if (previousTitle != title || force) {

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

+14 −10
Original line number Diff line number Diff line
@@ -41,15 +41,16 @@ import com.android.settings.ChooseLockGeneric; 
import com.android.settings.ChooseLockSettingsHelper;

import com.android.settings.HelpUtils;

import com.android.settings.R;

import com.android.setupwizardlib.SetupWizardItemsLayout;

import com.android.setupwizardlib.SetupWizardRecyclerLayout;

import com.android.setupwizardlib.items.IItem;

import com.android.setupwizardlib.items.Item;

import com.android.setupwizardlib.items.ItemAdapter;

import com.android.setupwizardlib.items.RecyclerItemAdapter;



/**

 * Onboarding activity for fingerprint enrollment.

 */

public class FingerprintEnrollIntroduction extends FingerprintEnrollBase

        implements AdapterView.OnItemClickListener {

        implements RecyclerItemAdapter.OnItemSelectedListener {



    protected static final int CHOOSE_LOCK_GENERIC_REQUEST = 1;

    protected static final int FINGERPRINT_FIND_SENSOR_REQUEST = 2;
@@ -62,14 +63,18 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.fingerprint_enroll_introduction);

        setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);

        final SetupWizardItemsLayout layout =

                (SetupWizardItemsLayout) findViewById(R.id.setup_wizard_layout);

        layout.getListView().setOnItemClickListener(this);

        final ItemAdapter adapter = (ItemAdapter) layout.getAdapter();

        final SetupWizardRecyclerLayout layout =

                (SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);

        final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();

        adapter.setOnItemSelectedListener(this);

        Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message);

        item.setTitle(LearnMoreSpan.linkify(

                getText(R.string.security_settings_fingerprint_enroll_introduction_message),

                getString(R.string.help_url_fingerprint)));

        // setupwizard library automatically sets the divider inset to

        // R.dimen.suw_items_icon_divider_inset. We adjust this back to 0 as we do not want

        // an inset within settings.

        layout.setDividerInset(0);

        updatePasswordQuality();

    }
@@ -148,9 +153,8 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase 
    }



    @Override

    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

        final Item item = (Item) parent.getItemAtPosition(position);

        switch (item.getId()) {

    public void onItemSelected(IItem item) {

        switch (((Item) item).getId()) {

            case R.id.next_button:

                onNextButtonClick();

                break;

src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.settings.R;

import com.android.settings.SetupChooseLockGeneric;

import com.android.settings.SetupWizardUtils;

import com.android.setupwizardlib.SetupWizardRecyclerLayout;

import com.android.setupwizardlib.view.NavigationBar;



public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction
@@ -60,6 +61,9 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu 
        Button nextButton = getNavigationBar().getNextButton();

        nextButton.setText(null);

        nextButton.setEnabled(false);

        SetupWizardRecyclerLayout layout = (SetupWizardRecyclerLayout) getSetupWizardLayout();

        layout.setDividerInset(getResources().getDimensionPixelSize(

                R.dimen.suw_items_icon_divider_inset));

    }



    @Override