PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Suppress some search results" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-17 01:20:42 +00:00
committed by Android (Google) Code Review
parent 89c2adf420 83eaff5e4a
commit f51b4a580f
4 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -22,8 +22,8 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -44,7 +44,16 @@ import java.util.List;
public class ConfigureNotificationSettings extends DashboardFragment {
private static final String TAG = "ConfigNotiSettings";
private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_notifications";
@VisibleForTesting
static final String KEY_LOCKSCREEN = "lock_screen_notifications";
@VisibleForTesting
static final String KEY_LOCKSCREEN_WORK_PROFILE_HEADER =
"lock_screen_notifications_profile_header";
@VisibleForTesting
static final String KEY_LOCKSCREEN_WORK_PROFILE = "lock_screen_notifications_profile";
@VisibleForTesting
static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_notifications";
private static final String KEY_NOTI_DEFAULT_RINGTONE = "notification_default_ringtone";
private RingtonePreference mRequestPreference;
@@ -80,9 +89,9 @@ public class ConfigureNotificationSettings extends DashboardFragment {
new PulseNotificationPreferenceController(context);
final LockScreenNotificationPreferenceController lockScreenNotificationController =
new LockScreenNotificationPreferenceController(context,
"lock_screen_notifications",
"lock_screen_notifications_profile_header",
"lock_screen_notifications_profile");
KEY_LOCKSCREEN,
KEY_LOCKSCREEN_WORK_PROFILE_HEADER,
KEY_LOCKSCREEN_WORK_PROFILE);
if (lifecycle != null) {
lifecycle.addObserver(pulseController);
lifecycle.addObserver(lockScreenNotificationController);
@@ -156,9 +165,19 @@ public class ConfigureNotificationSettings extends DashboardFragment {
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
public List<AbstractPreferenceController> getPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
keys.add(KEY_SWIPE_DOWN);
keys.add(KEY_LOCKSCREEN);
keys.add(KEY_LOCKSCREEN_WORK_PROFILE);
keys.add(KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
return keys;
}
};
}

11
src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.notification;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
@@ -41,9 +44,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.ArrayList;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
public class LockScreenNotificationPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
@@ -79,11 +79,10 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
mProfileChallengeUserId = Utils.getManagedProfileId(
UserManager.get(context), UserHandle.myUserId());
final LockPatternUtils utils = new LockPatternUtils(context);
final boolean isUnified =
!utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId);
mSecure = utils.isSecure(UserHandle.myUserId());
mSecureProfile = (mProfileChallengeUserId != UserHandle.USER_NULL)
&& (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure));
&& (utils.isSecure(mProfileChallengeUserId)
|| (!utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId) && mSecure));
}
@Override