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

[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Browse Source 
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
This commit is contained in:
Maurice Lam
2016-09-02 16:34:38 -07:00
parent e6ad6e866b
commit c94f2b93af
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings.Global;
import android.view.View; import android.view.View;
import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.ChooseLockSettingsHelper;
@@ -39,7 +40,11 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
setContentView(R.layout.fingerprint_enroll_introduction); setContentView(R.layout.fingerprint_enroll_introduction);
setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title); setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
findViewById(R.id.cancel_button).setOnClickListener(this); findViewById(R.id.cancel_button).setOnClickListener(this);
findViewById(R.id.learn_more_button).setOnClickListener(this); final View learnMoreButton = findViewById(R.id.learn_more_button);
learnMoreButton.setOnClickListener(this);
if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
learnMoreButton.setVisibility(View.GONE);
}
final int passwordQuality = new ChooseLockSettingsHelper(this).utils() final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
.getActivePasswordQuality(UserHandle.myUserId()); .getActivePasswordQuality(UserHandle.myUserId());
mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
@@ -90,6 +95,8 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
private void launchFingerprintHelp() { private void launchFingerprintHelp() {
Intent helpIntent = HelpUtils.getHelpIntent(this, Intent helpIntent = HelpUtils.getHelpIntent(this,
getString(R.string.help_url_fingerprint), getClass().getName()); getString(R.string.help_url_fingerprint), getClass().getName());
if (helpIntent != null) {
startActivity(helpIntent); startActivity(helpIntent);
} }
}
} }