New activity that asks users to confirm their pattern. DO NOT MERGE
Adds an activity that prompts the user for their PIN/password/pattern.
cherry-pick from master b88e8577b9
Bug 16242766
Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d
This commit is contained in:
@@ -1057,6 +1057,16 @@
|
|||||||
<!-- Second and third-level settings -->
|
<!-- Second and third-level settings -->
|
||||||
|
|
||||||
<!-- Lock screen settings -->
|
<!-- Lock screen settings -->
|
||||||
|
<activity android:name="ConfirmDeviceCredentialActivity"
|
||||||
|
android:exported="true">
|
||||||
|
<!-- Use high-priority to prevent an installed activity from masquerading as this one. -->
|
||||||
|
<intent-filter android:priority="1000">
|
||||||
|
<action android:name="android.intent.action.CONFIRM_DEVICE_CREDENTIAL" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
|
||||||
<activity android:name="ConfirmLockPattern"/>
|
<activity android:name="ConfirmLockPattern"/>
|
||||||
|
|
||||||
<activity android:name="ConfirmLockPassword"
|
<activity android:name="ConfirmLockPassword"
|
||||||
|
@@ -0,0 +1,55 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2014 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 android.app.Activity;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Launch this when you want to confirm the user is present by asking them to enter their
|
||||||
|
* PIN/password/pattern.
|
||||||
|
*/
|
||||||
|
public class ConfirmDeviceCredentialActivity extends Activity {
|
||||||
|
public static final String TAG = ConfirmDeviceCredentialActivity.class.getSimpleName();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
String title = intent.getStringExtra(Intent.EXTRA_TITLE);
|
||||||
|
String details = intent.getStringExtra(Intent.EXTRA_DETAILS);
|
||||||
|
|
||||||
|
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
|
||||||
|
if (!helper.launchConfirmationActivity(0 /* request code */, title, details)) {
|
||||||
|
Log.d(TAG, "No pattern, password or PIN set.");
|
||||||
|
setResult(Activity.RESULT_OK);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
boolean credentialsConfirmed = (resultCode == Activity.RESULT_OK);
|
||||||
|
Log.d(TAG, "Device credentials confirmed: " + credentialsConfirmed);
|
||||||
|
setResult(credentialsConfirmed ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user