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

Can launch into the lock screen with setup wizard style

Browse Source 
The trampoline currently always uses the settings style for set action
new password. When called during setup wizard, it should launch the
setup wizard style.

Test: Added robotests for launching activity and copying setup wizard
extras. Also manually tested with an application when device is
provisioned and not provisioned.

bug:32575389
Change-Id: I5763eb87b63a46b05cd200bb73b15bdc24c8bd3b
This commit is contained in:
Udam Saini
2016-11-01 11:20:14 -07:00
parent 80d1ec7dee
commit d6b1c666c5
5 changed files with 150 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}