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

Update button styles for fingerprint

Browse Source 
Use button styles instead of list style because of UX spec change.

Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
This commit is contained in:
Maurice Lam
2016-06-27 12:59:12 -07:00
parent 1926ed9f83
commit 584a11ec4a
4 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -24,24 +24,21 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.CharSequences;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settingslib.HelpUtils;
import com.android.setupwizardlib.GlifRecyclerLayout;
import com.android.setupwizardlib.items.IItem;
import com.android.setupwizardlib.items.Item;
import com.android.setupwizardlib.items.RecyclerItemAdapter;
import com.android.setupwizardlib.span.LinkSpan;
/**
* Onboarding activity for fingerprint enrollment.
*/
public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
implements RecyclerItemAdapter.OnItemSelectedListener, LinkSpan.OnClickListener {
implements View.OnClickListener, LinkSpan.OnClickListener {
private static final String TAG = "FingerprintIntro";
@@ -57,12 +54,11 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
super.onCreate(savedInstanceState);
setContentView(R.layout.fingerprint_enroll_introduction);
setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
final GlifRecyclerLayout layout = (GlifRecyclerLayout) getLayout();
final Button cancelButton = (Button) findViewById(R.id.fingerprint_cancel_button);
cancelButton.setOnClickListener(this);
mUserManager = UserManager.get(this);
final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
adapter.setOnItemSelectedListener(this);
Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message);
item.setTitle(getText(R.string.security_settings_fingerprint_enroll_introduction_message));
updatePasswordQuality();
}
@@ -72,6 +68,11 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
@Override
protected Button getNextButton() {
return (Button) findViewById(R.id.fingerprint_next_button);
}
@Override
protected void onNextButtonClick() {
if (!mHasPassword) {
@@ -142,14 +143,11 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
}
@Override
public void onItemSelected(IItem item) {
switch (((Item) item).getId()) {
case R.id.next_button:
onNextButtonClick();
break;
case R.id.cancel_button:
onCancelButtonClick();
break;
public void onClick(View v) {
if (v.getId() == R.id.fingerprint_cancel_button) {
onCancelButtonClick();
} else {
super.onClick(v);
}
}