am 7258665b: am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."
* commit '7258665bd0a6b5693cf0b38faaee16af9d20bae9':
Revert "Move global sync settings to AccountSettings."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a0563b4..308d7bf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1009,6 +1009,16 @@
<!-- Second and third-level 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="ConfirmLockPassword"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bbce4e4..0115241 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -323,8 +323,8 @@
<!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
<string name="bluetooth_permission_request">"Bluetooth permission request"</string>
- <!-- Strings for asking to the user whether to allow an app to enable bluetooth -->
- <string name="bluetooth_ask_enablement">An app wants to turn on Bluetooth.</string>
+ <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+ <string name="bluetooth_ask_enablement">An app wants to turn Bluetooth ON for this device.</string>
<!-- String for informing the user that bluetooth devices must be granted permission. [CHAR LIMIT=100] -->
<string name="bluetooth_message_access_notice">Bluetooth devices must ask for permission before accessing available accounts.</string>
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
new file mode 100644
index 0000000..6a5c486
--- /dev/null
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -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();
+ }
+}