Merge "Revert "First commit of dynamic home page feature""
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3b6d4f8..6a2af9e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1562,11 +1562,11 @@
android:windowSoftInputMode="stateHidden|adjustResize"
android:theme="@style/GlifTheme.Light"/>
- <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
- <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
- <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
- <activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
- <activity android:name=".fingerprint.FingerprintEnrollIntroduction"
+ <activity android:name=".biometrics.fingerprint.FingerprintSettings" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroduction"
android:exported="true"
android:theme="@style/GlifTheme.Light">
<intent-filter>
@@ -1575,10 +1575,10 @@
</intent-filter>
</activity>
- <activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
- <activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
- <activity android:name=".fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
- <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"
android:theme="@style/GlifTheme.Light">
@@ -1588,7 +1588,7 @@
</intent-filter>
</activity>
- <activity android:name=".fingerprint.FingerprintSuggestionActivity"
+ <activity android:name=".biometrics.fingerprint.FingerprintSuggestionActivity"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"
android:icon="@drawable/ic_suggestion_fingerprint"
@@ -1663,7 +1663,7 @@
<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
</activity>
- <activity android:name=".fingerprint.FingerprintEnrollSuggestionActivity"
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollSuggestionActivity"
android:icon="@drawable/ic_suggestion_fingerprint">
<intent-filter android:priority="2">
<action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/fingerprint_enroll_find_sensor_graphic.xml b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
index 1c6ab80..0690457 100644
--- a/res/layout/fingerprint_enroll_find_sensor_graphic.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
@@ -28,7 +28,7 @@
android:src="@drawable/fingerprint_sensor_location"
android:scaleType="centerInside"/>
- <com.android.settings.fingerprint.FingerprintLocationAnimationView
+ <com.android.settings.biometrics.fingerprint.FingerprintLocationAnimationView
android:id="@+id/fingerprint_sensor_location_animation"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
new file mode 100644
index 0000000..7216d76
--- /dev/null
+++ b/res/layout/settings_base_layout.xml
@@ -0,0 +1,35 @@
+<!--
+ Copyright (C) 2018 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.
+-->
+<!-- The main content view -->
+<LinearLayout
+ android:id="@+id/content_parent"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <Toolbar
+ android:id="@+id/action_bar"
+ style="?android:attr/actionBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="?android:attr/actionBarTheme"
+ android:navigationContentDescription="@*android:string/action_bar_up_description" />
+ <FrameLayout
+ android:id="@+id/content_frame"
+ android:layout_width="match_parent"
+ android:layout_height="fill_parent"
+ android:background="?android:attr/windowBackground" />
+</LinearLayout>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3794d0e..711cb21 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -52,6 +52,7 @@
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.backup.BackupSettingsActivity;
+import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.gateway.SettingsGateway;
import com.android.settings.dashboard.DashboardFeatureProvider;
@@ -64,7 +65,6 @@
import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
@@ -76,7 +76,8 @@
import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceManager;
-public class SettingsActivity extends SettingsDrawerActivity
+
+public class SettingsActivity extends SettingsBaseActivity
implements PreferenceManager.OnPreferenceTreeClickListener,
PreferenceFragment.OnPreferenceStartFragmentCallback,
ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
@@ -606,7 +607,7 @@
private void updateTilesList() {
// Generally the items that are will be changing from these updates will
// not be in the top list of tiles, so run it in the background and the
- // SettingsDrawerActivity will pick up on the updates automatically.
+ // SettingsBaseActivity will pick up on the updates automatically.
AsyncTask.execute(new Runnable() {
@Override
public void run() {
diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java
index 53406fe..3383216 100644
--- a/src/com/android/settings/backup/BackupSettingsHelper.java
+++ b/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -152,7 +152,6 @@
}
private Intent getIntentForDefaultBackupSettings() {
- // Extra needed by {@link SettingsDrawerActivity} to show the back button navigation.
return new Intent(mContext, PrivacySettingsActivity.class);
}
diff --git a/src/com/android/settings/fingerprint/OWNERS b/src/com/android/settings/biometrics/OWNERS
similarity index 89%
rename from src/com/android/settings/fingerprint/OWNERS
rename to src/com/android/settings/biometrics/OWNERS
index 937b303..6332a46 100644
--- a/src/com/android/settings/fingerprint/OWNERS
+++ b/src/com/android/settings/biometrics/OWNERS
@@ -1,5 +1,6 @@
# Default reviewers for this and subdirectories.
jaggies@google.com
+kchyn@google.com
yukl@google.com
# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
index 1fa59a2..0b92326 100644
--- a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintEnrollBase.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
index 5a148d3..a65ee8c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.annotation.Nullable;
import android.content.Intent;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
similarity index 99%
rename from src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index b87e61f..2b7a20b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.animation.Animator;
import android.animation.ObjectAnimator;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index e572982..bc01458 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
@@ -27,7 +27,7 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollSidecar.Listener;
import com.android.settings.password.ChooseLockSettingsHelper;
import androidx.annotation.Nullable;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
similarity index 97%
rename from src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 4bd438c..8b175ec 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
similarity index 99%
rename from src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index dd83121..dfcdace 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.admin.DevicePolicyManager;
import android.content.ActivityNotFoundException;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index 7f7cb67..af56310 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.annotation.Nullable;
import android.app.Activity;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
similarity index 95%
rename from src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
index 4a4d08d..fb2c668 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Context;
diff --git a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java b/src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
similarity index 94%
rename from src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
index 07ab99d..8ce507e 100644
--- a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
/**
* An abstraction for a view that contains an animation that shows the user
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
index b988ab7..c79ed49 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.ContentResolver;
import android.content.Context;
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
index 0812f2d..99d4ff9 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
similarity index 95%
rename from src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
index 68d2ade..23873f9 100644
--- a/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Context;
import android.os.UserHandle;
diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
similarity index 96%
rename from src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
index ce679b6..25cd2f5 100644
--- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.annotation.Nullable;
import android.hardware.fingerprint.Fingerprint;
@@ -121,7 +121,7 @@
}
final boolean isRemovingFingerprint(int fid) {
- return inProgress() && mFingerprintRemoving.getFingerId() == fid;
+ return inProgress() && mFingerprintRemoving.getBiometricId() == fid;
}
final boolean inProgress() {
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
similarity index 97%
rename from src/com/android/settings/fingerprint/FingerprintSettings.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 880ca62..60e09d2 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
@@ -161,7 +161,7 @@
@Override
public void onAuthenticationSucceeded(
FingerprintManager.AuthenticationResult result) {
- int fingerId = result.getFingerprint().getFingerId();
+ int fingerId = result.getFingerprint().getBiometricId();
mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
}
@@ -187,7 +187,7 @@
new FingerprintRemoveSidecar.Listener() {
public void onRemovalSucceeded(Fingerprint fingerprint) {
mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
- fingerprint.getFingerId(), 0).sendToTarget();
+ fingerprint.getBiometricId(), 0).sendToTarget();
updateDialog();
}
@@ -393,16 +393,16 @@
final Fingerprint item = items.get(i);
FingerprintPreference pref = new FingerprintPreference(root.getContext(),
this /* onDeleteClickListener */);
- pref.setKey(genKey(item.getFingerId()));
+ pref.setKey(genKey(item.getBiometricId()));
pref.setTitle(item.getName());
pref.setFingerprint(item);
pref.setPersistent(false);
pref.setIcon(R.drawable.ic_fingerprint_24dp);
- if (mRemovalSidecar.isRemovingFingerprint(item.getFingerId())) {
+ if (mRemovalSidecar.isRemovingFingerprint(item.getBiometricId())) {
pref.setEnabled(false);
}
- if (mFingerprintsRenaming.containsKey(item.getFingerId())) {
- pref.setTitle(mFingerprintsRenaming.get(item.getFingerId()));
+ if (mFingerprintsRenaming.containsKey(item.getBiometricId())) {
+ pref.setTitle(mFingerprintsRenaming.get(item.getBiometricId()));
}
root.addPreference(pref);
pref.setOnPreferenceChangeListener(this);
@@ -522,9 +522,9 @@
private void showRenameDialog(final Fingerprint fp) {
RenameDialog renameDialog = new RenameDialog();
Bundle args = new Bundle();
- if (mFingerprintsRenaming.containsKey(fp.getFingerId())) {
- final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getFingerId()),
- fp.getGroupId(), fp.getFingerId(), fp.getDeviceId());
+ if (mFingerprintsRenaming.containsKey(fp.getBiometricId())) {
+ final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getBiometricId()),
+ fp.getGroupId(), fp.getBiometricId(), fp.getDeviceId());
args.putParcelable("fingerprint", f);
} else {
args.putParcelable("fingerprint", fp);
@@ -648,7 +648,7 @@
@VisibleForTesting
void deleteFingerPrint(Fingerprint fingerPrint) {
mRemovalSidecar.startRemove(fingerPrint, mUserId);
- String name = genKey(fingerPrint.getFingerId());
+ String name = genKey(fingerPrint.getBiometricId());
Preference prefToRemove = findPreference(name);
prefToRemove.setEnabled(false);
updateAddPreference();
@@ -711,7 +711,7 @@
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
- final int fingerprintId = mFp.getFingerId();
+ final int fingerprintId = mFp.getBiometricId();
Log.v(TAG, "Removing fpId=" + fingerprintId);
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_FINGERPRINT_DELETE,
@@ -760,11 +760,11 @@
Log.d(TAG, "rename " + name + " to " + newName);
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_FINGERPRINT_RENAME,
- mFp.getFingerId());
+ mFp.getBiometricId());
FingerprintSettingsFragment parent
= (FingerprintSettingsFragment)
getTargetFragment();
- parent.renameFingerPrint(mFp.getFingerId(),
+ parent.renameFingerPrint(mFp.getBiometricId(),
newName);
}
dialog.dismiss();
diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
index 2839ee6..e13e8ac 100644
--- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
similarity index 97%
rename from src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
index fa6aeb4..f5fe92b 100644
--- a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintUiHelper.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
index 4a67ecd..012f802 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.os.CancellationSignal;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
similarity index 95%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
index fbbf033..c2c4930 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
similarity index 98%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
index 3a4c3f7..d3acbea 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
similarity index 96%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
index e81203f..c73417b 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
import android.os.UserHandle;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
similarity index 98%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index 5656a27..c7c0bb4 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
import android.app.KeyguardManager;
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index d654944..44ef4be 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -35,7 +35,7 @@
implements Preference.OnPreferenceClickListener {
private static final String TAG = "AvailableMediaBluetoothDeviceUpdater";
- private static final boolean DBG = false;
+ private static final boolean DBG = true;
private final AudioManager mAudioManager;
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 485f691..be7ff25 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.Bundle;
import android.os.SystemProperties;
+import android.util.Log;
import com.android.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
@@ -49,6 +50,7 @@
public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
LocalBluetoothProfileManager.ServiceListener {
private static final String TAG = "BluetoothDeviceUpdater";
+ private static final boolean DBG = true;
private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
"persist.bluetooth.showdeviceswithoutnames";
@@ -250,6 +252,10 @@
return false;
}
final BluetoothDevice device = cachedDevice.getDevice();
+ if (DBG) {
+ Log.d(TAG, "isDeviceConnected() device name : " + cachedDevice.getName() +
+ ", is connected : " + device.isConnected());
+ }
return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
}
}
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index ec906a6..500fb06 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -35,7 +35,7 @@
public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
private static final String TAG = "ConnBluetoothDeviceUpdater";
- private static final boolean DBG = false;
+ private static final boolean DBG = true;
private final AudioManager mAudioManager;
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index 2b52672..c9fa056 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -19,6 +19,7 @@
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import android.util.Log;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -33,6 +34,7 @@
public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
implements Preference.OnPreferenceClickListener {
private static final String TAG = "SavedBluetoothDeviceUpdater";
+ private static final boolean DBG = true;
public SavedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
DevicePreferenceCallback devicePreferenceCallback) {
@@ -59,6 +61,10 @@
@Override
public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
final BluetoothDevice device = cachedDevice.getDevice();
+ if (DBG) {
+ Log.d(TAG, "isFilterMatched() device name : " + cachedDevice.getName() +
+ ", is connected : " + device.isConnected());
+ }
return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
}
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
new file mode 100644
index 0000000..2cce467
--- /dev/null
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -0,0 +1,211 @@
+/**
+ * Copyright (C) 2018 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.core;
+
+import android.annotation.LayoutRes;
+import android.annotation.Nullable;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.ArraySet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager.LayoutParams;
+import android.widget.Toolbar;
+
+import com.android.settings.R;
+import com.android.settingslib.drawer.CategoryManager;
+import com.android.settingslib.drawer.TileUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.fragment.app.FragmentActivity;
+
+public class SettingsBaseActivity extends FragmentActivity {
+
+ protected static final boolean DEBUG_TIMING = false;
+ private static final String TAG = "SettingsBaseActivity";
+ private static final String DATA_SCHEME_PKG = "package";
+
+ // Serves as a temporary list of tiles to ignore until we heard back from the PM that they
+ // are disabled.
+ private static ArraySet<ComponentName> sTileBlacklist = new ArraySet<>();
+
+ private final PackageReceiver mPackageReceiver = new PackageReceiver();
+ private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ final long startTime = System.currentTimeMillis();
+
+ final TypedArray theme = getTheme().obtainStyledAttributes(android.R.styleable.Theme);
+ if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {
+ getWindow().addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ }
+ super.setContentView(R.layout.settings_base_layout);
+
+ final Toolbar toolbar = findViewById(R.id.action_bar);
+ if (theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {
+ toolbar.setVisibility(View.GONE);
+ return;
+ }
+ setActionBar(toolbar);
+
+ if (DEBUG_TIMING) {
+ Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+ + " ms");
+ }
+ }
+
+ @Override
+ public boolean onNavigateUp() {
+ if (!super.onNavigateUp()) {
+ finish();
+ }
+ return true;
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+ filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+ filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+ filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+ filter.addDataScheme(DATA_SCHEME_PKG);
+ registerReceiver(mPackageReceiver, filter);
+
+ new CategoriesUpdateTask().execute();
+ }
+
+ @Override
+ protected void onPause() {
+ unregisterReceiver(mPackageReceiver);
+ super.onPause();
+ }
+
+ public void addCategoryListener(CategoryListener listener) {
+ mCategoryListeners.add(listener);
+ }
+
+ public void remCategoryListener(CategoryListener listener) {
+ mCategoryListeners.remove(listener);
+ }
+
+ @Override
+ public void setContentView(@LayoutRes int layoutResID) {
+ final ViewGroup parent = findViewById(R.id.content_frame);
+ if (parent != null) {
+ parent.removeAllViews();
+ }
+ LayoutInflater.from(this).inflate(layoutResID, parent);
+ }
+
+ @Override
+ public void setContentView(View view) {
+ ((ViewGroup) findViewById(R.id.content_frame)).addView(view);
+ }
+
+ @Override
+ public void setContentView(View view, ViewGroup.LayoutParams params) {
+ ((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);
+ }
+
+ private void onCategoriesChanged() {
+ final int N = mCategoryListeners.size();
+ for (int i = 0; i < N; i++) {
+ mCategoryListeners.get(i).onCategoriesChanged();
+ }
+ }
+
+ /**
+ * @return whether or not the enabled state actually changed.
+ */
+ public boolean setTileEnabled(ComponentName component, boolean enabled) {
+ final PackageManager pm = getPackageManager();
+ int state = pm.getComponentEnabledSetting(component);
+ boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+ if (isEnabled != enabled || state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
+ if (enabled) {
+ sTileBlacklist.remove(component);
+ } else {
+ sTileBlacklist.add(component);
+ }
+ pm.setComponentEnabledSetting(component, enabled
+ ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+ : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+ PackageManager.DONT_KILL_APP);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Updates dashboard categories. Only necessary to call this after setTileEnabled
+ */
+ public void updateCategories() {
+ new CategoriesUpdateTask().execute();
+ }
+
+ public String getSettingPkg() {
+ return TileUtils.SETTING_PKG;
+ }
+
+ public interface CategoryListener {
+ void onCategoriesChanged();
+ }
+
+ private class CategoriesUpdateTask extends AsyncTask<Void, Void, Void> {
+
+ private final CategoryManager mCategoryManager;
+
+ public CategoriesUpdateTask() {
+ mCategoryManager = CategoryManager.get(SettingsBaseActivity.this);
+ }
+
+ @Override
+ protected Void doInBackground(Void... params) {
+ mCategoryManager.reloadAllCategories(SettingsBaseActivity.this, getSettingPkg());
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void result) {
+ mCategoryManager.updateCategoryFromBlacklist(sTileBlacklist);
+ onCategoriesChanged();
+ }
+ }
+
+ private class PackageReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ new CategoriesUpdateTask().execute();
+ }
+ }
+}
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index ecf905e..67ffb76 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -27,13 +27,13 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper;
+import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils;
@@ -52,7 +52,7 @@
* Base fragment for dashboard style UI containing a list of static and dynamic setting items.
*/
public abstract class DashboardFragment extends SettingsPreferenceFragment
- implements SettingsDrawerActivity.CategoryListener, Indexable,
+ implements SettingsBaseActivity.CategoryListener, Indexable,
SummaryLoader.SummaryConsumer {
private static final String TAG = "DashboardFragment";
@@ -145,9 +145,9 @@
mSummaryLoader.setListening(true);
}
final Activity activity = getActivity();
- if (activity instanceof SettingsDrawerActivity) {
+ if (activity instanceof SettingsBaseActivity) {
mListeningToCategoryChange = true;
- ((SettingsDrawerActivity) activity).addCategoryListener(this);
+ ((SettingsBaseActivity) activity).addCategoryListener(this);
}
}
@@ -197,8 +197,8 @@
}
if (mListeningToCategoryChange) {
final Activity activity = getActivity();
- if (activity instanceof SettingsDrawerActivity) {
- ((SettingsDrawerActivity) activity).remCategoryListener(this);
+ if (activity instanceof SettingsBaseActivity) {
+ ((SettingsBaseActivity) activity).remCategoryListener(this);
}
mListeningToCategoryChange = false;
}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 0bb4ce2..1b9b75f 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -30,6 +30,8 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.SettingsBaseActivity;
+import com.android.settings.core.SettingsBaseActivity.CategoryListener;
import com.android.settings.dashboard.conditional.Condition;
import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settings.dashboard.conditional.ConditionManager.ConditionListener;
@@ -40,8 +42,6 @@
import com.android.settings.widget.ActionBarShadowController;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.SettingsDrawerActivity;
-import com.android.settingslib.drawer.SettingsDrawerActivity.CategoryListener;
import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.utils.ThreadUtils;
@@ -138,7 +138,7 @@
long startTime = System.currentTimeMillis();
super.onResume();
- ((SettingsDrawerActivity) getActivity()).addCategoryListener(this);
+ ((SettingsBaseActivity) getActivity()).addCategoryListener(this);
mSummaryLoader.setListening(true);
final int metricsCategory = getMetricsCategory();
for (Condition c : mConditionManager.getConditions()) {
@@ -156,7 +156,7 @@
public void onPause() {
super.onPause();
- ((SettingsDrawerActivity) getActivity()).remCategoryListener(this);
+ ((SettingsBaseActivity) getActivity()).remCategoryListener(this);
mSummaryLoader.setListening(false);
for (Condition c : mConditionManager.getConditions()) {
if (c.shouldShow()) {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index f71a6bc..1d58ed5 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -28,8 +28,8 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.Settings.NightDisplaySuggestionActivity;
import com.android.settings.display.NightDisplayPreferenceController;
-import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
-import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.notification.ZenOnboardingActivity;
import com.android.settings.notification.ZenSuggestionActivity;
import com.android.settings.overlay.FeatureFactory;
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 1dc8baa..68678dc 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -53,8 +53,8 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.fingerprint.FingerprintEnrollBase;
-import com.android.settings.fingerprint.FingerprintEnrollFindSensor;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollBase;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedPreference;
@@ -682,7 +682,7 @@
CharSequence errString) {
Log.e(TAG, String.format(
"Can't remove fingerprint %d in group %d. Reason: %s",
- fp.getFingerId(), fp.getGroupId(), errString));
+ fp.getBiometricId(), fp.getGroupId(), errString));
// TODO: need to proceed with the removal of managed profile
// fingerprints and finish() gracefully.
}
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 3f26750..74207cd 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -53,7 +53,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.fingerprint.FingerprintUiHelper;
+import com.android.settings.biometrics.fingerprint.FingerprintUiHelper;
/**
* Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 4258d76..0540bbf 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -31,7 +31,7 @@
import com.android.settings.R;
import com.android.settings.SetupEncryptionInterstitial;
import com.android.settings.SetupWizardUtils;
-import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index b590618..30ac402 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -29,8 +29,8 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;
-import com.android.settings.fingerprint.FingerprintProfileStatusPreferenceController;
-import com.android.settings.fingerprint.FingerprintStatusPreferenceController;
+import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
+import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
import com.android.settings.location.LocationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController;
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 393fe61..45474e7 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -6,7 +6,7 @@
com.android.settings.datausage.DataUsageList
com.android.settings.vpn2.AppManagementFragment
com.android.settings.vpn2.VpnSettings
-com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment
+com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment
com.android.settings.applications.ProcessStatsDetail
com.android.settings.wifi.WifiInfo
com.android.settings.applications.VrListenerSettings
diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
index d306d06..27729cf 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -23,8 +23,8 @@
import android.app.Dialog;
import android.hardware.fingerprint.Fingerprint;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog;
+import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
+import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index 8c8113b..bee208f 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 1fe0931..338b3c0 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
index 74d4b28..888b061 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
index 24eb1ad..e8b27a8 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -15,7 +15,7 @@
*
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
index f8984ab..8c90cb7 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
@@ -25,7 +25,7 @@
import android.widget.FrameLayout;
import com.android.settings.R;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
+import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
index 583428e..fe3f5b0 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
index e01ed3c..7fe114b 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index ee47f2a..310674e 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index 85d7ad8..38127ef 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 9e62511..bbdb443 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.RuntimeEnvironment.application;
@@ -27,7 +27,7 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper;
import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
import com.android.settings.password.SetupSkipDialog;
import com.android.settings.password.StorageManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index a6acf27..38d9ce5 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -28,8 +28,8 @@
import com.android.settings.R;
import com.android.settings.Settings;
-import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
-import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.notification.ZenSuggestionActivity;
import com.android.settings.support.NewDeviceIntroSuggestionActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
rename to tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
index b09d1bf..da25ac0 100644
--- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static android.support.test.InstrumentationRegistry.getTargetContext;
import static android.support.test.espresso.Espresso.onView;
diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java
rename to tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
index 235ba1e..e937b7f 100644
--- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.mockito.Matchers.anyInt;