summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/security
diff options
context:
space:
mode:
authorEdgar Wang <edgarwang@google.com>2020-01-09 08:53:22 +0000
committerEdgar Wang <edgarwang@google.com>2020-01-16 14:07:38 +0800
commite19ee9a01fdcb373c3ba33c898cbb24c1f218326 (patch)
tree76e173f912de9cebb293fe0dc219b12eb7e35fc9 /src/com/android/settings/security
parent4bc2ba2cb90e8bfe91994d0e8b52bdde375a7406 (diff)
downloadpackages_apps_Settings-e19ee9a01fdcb373c3ba33c898cbb24c1f218326.tar.gz
packages_apps_Settings-e19ee9a01fdcb373c3ba33c898cbb24c1f218326.tar.bz2
packages_apps_Settings-e19ee9a01fdcb373c3ba33c898cbb24c1f218326.zip
Revert "Settings search - Navigate user to exact page"
This reverts commit 08f2a58459610afe052a0abcce25afd53197032b. Reason for revert: design changed, we decide to take the user to the entry after clicking on a search result. It's opposite with what we did, so we revert related CL first. Test: robotest Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
Diffstat (limited to 'src/com/android/settings/security')
-rw-r--r--src/com/android/settings/security/LockscreenDashboardFragment.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 8098b803f9..29b114a318 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -57,6 +57,9 @@ public class LockscreenDashboardFragment extends DashboardFragment
@VisibleForTesting
static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE =
"security_setting_lock_screen_notif_work";
+ @VisibleForTesting
+ static final String KEY_ADD_USER_FROM_LOCK_SCREEN =
+ "security_lockscreen_add_users_when_locked";
private AmbientDisplayConfiguration mConfig;
@@ -139,6 +142,13 @@ public class LockscreenDashboardFragment extends DashboardFragment
}
@Override
+ public List<String> getNonIndexableKeys(Context context) {
+ final List<String> niks = super.getNonIndexableKeys(context);
+ niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);
+ return niks;
+ }
+
+ @Override
protected boolean isPageSearchEnabled(Context context) {
return new LockScreenPreferenceController(context, "anykey")
.isAvailable();