bbb4afa19f
This changes the organization of lock screen security settings to make choosing an alternate unlock method more discoverable. Instead of having to disable the old lock method to use a new one, the user now just has one set/change option in lock settings, with a list of method-specific setting below it. In addition, we ask the user to confirm their old credentials before prompting them to choose a new one, which eliminates one source of confusion. Also, ChooseLockGeneric now shows a UI if quality isn't specified. Any unlock method less secure than minimum specified by DevicePolicyManager (if active) is greyed out. Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
67 lines
2.3 KiB
Java
67 lines
2.3 KiB
Java
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings;
|
|
|
|
import com.android.internal.widget.LockPatternUtils;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.view.View;
|
|
|
|
public class ChooseLockPatternTutorial extends Activity implements View.OnClickListener {
|
|
private View mNextButton;
|
|
private View mSkipButton;
|
|
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
// Don't show the tutorial if the user has seen it before.
|
|
LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
|
|
if (savedInstanceState == null && lockPatternUtils.isPatternEverChosen()) {
|
|
Intent intent = new Intent(this, ChooseLockPattern.class);
|
|
intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
|
|
startActivity(intent);
|
|
finish();
|
|
} else {
|
|
initViews();
|
|
}
|
|
}
|
|
|
|
private void initViews() {
|
|
setContentView(R.layout.choose_lock_pattern_tutorial);
|
|
mNextButton = findViewById(R.id.next_button);
|
|
mNextButton.setOnClickListener(this);
|
|
mSkipButton = findViewById(R.id.skip_button);
|
|
mSkipButton.setOnClickListener(this);
|
|
}
|
|
|
|
public void onClick(View v) {
|
|
if (v == mSkipButton) {
|
|
// Canceling, so finish all
|
|
setResult(ChooseLockPattern.RESULT_FINISHED);
|
|
finish();
|
|
} else if (v == mNextButton) {
|
|
Intent intent = new Intent(this, ChooseLockPatternExample.class);
|
|
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
|
|
startActivity(intent);
|
|
finish();
|
|
}
|
|
}
|
|
}
|
|
|