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

Merge "Can launch into the lock screen with setup wizard style"

Browse Source
This commit is contained in:
Udam Saini
2016-11-03 17:28:19 +00:00
committed by Android (Google) Code Review
parent 8109a0fb6b d6b1c666c5
commit e2bd1d9fa6
5 changed files with 150 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -338,7 +338,7 @@ public class ChooseLockGeneric extends SettingsActivity {
}
} else if (requestCode == CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
&& resultCode == FingerprintEnrollBase.RESULT_FINISHED) {
Intent intent = new Intent(getActivity(), FingerprintEnrollFindSensor.class);
Intent intent = getFindSensorIntent(getActivity());
if (data != null) {
intent.putExtras(data.getExtras());
}
@@ -359,6 +359,10 @@ public class ChooseLockGeneric extends SettingsActivity {
}
}
protected Intent getFindSensorIntent(Context context) {
return new Intent(context, FingerprintEnrollFindSensor.class);
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

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

@@ -33,6 +33,7 @@ import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.fingerprint.SetupSkipDialog;
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
@@ -242,5 +243,12 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
return intent;
}
@Override
protected Intent getFindSensorIntent(Context context) {
final Intent intent = new Intent(context, SetupFingerprintEnrollFindSensor.class);
SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
return intent;
}
}
}

9
src/com/android/settings/password/SetNewPasswordActivity.java
View File

@@ -23,6 +23,9 @@ import android.content.Intent;
import android.os.Bundle;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.SetupChooseLockGeneric;
import com.android.settings.Utils;
/**
* Trampolines {@link DevicePolicyManager#ACTION_SET_NEW_PASSWORD} and
@@ -44,8 +47,10 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo
@Override
public void launchChooseLock(@Nullable Bundle chooseLockFingerprintExtras) {
Intent intent = new Intent(this, ChooseLockGeneric.class)
.setAction(mNewPasswordAction);
final boolean isInSetupWizard = !Utils.isDeviceProvisioned(this);
Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class)
: new Intent(this, ChooseLockGeneric.class);
intent.setAction(mNewPasswordAction);
if (chooseLockFingerprintExtras != null) {
intent.putExtras(chooseLockFingerprintExtras);
}