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;
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;
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);
}
@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;
+ }
};
}
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;
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 {
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
--- /dev/null
+/*
+ * Copyright (C) 2017 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.notification;
+
+import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN;
+import static com.android.settings.notification.ConfigureNotificationSettings
+ .KEY_LOCKSCREEN_WORK_PROFILE;
+import static com.android.settings.notification.ConfigureNotificationSettings
+ .KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
+import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConfigureNotificationSettingsTest {
+
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ }
+
+ @Test
+ @Config(shadows = {
+ ShadowUtils.class,
+ ShadowLockPatternUtils.class
+ })
+ public void getNonIndexableKeys_shouldContainLockScreenPrefs() {
+ final List<String> keys = ConfigureNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
+ .getNonIndexableKeys(mContext);
+
+ assertThat(keys).containsAllOf(
+ KEY_SWIPE_DOWN, KEY_LOCKSCREEN, KEY_LOCKSCREEN_WORK_PROFILE,
+ KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
+ }
+}
import android.content.ComponentName;
import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
import com.android.settings.Utils;
import com.android.settings.password.IFingerprintManager;
public static ComponentName getDeviceOwnerComponent(Context context) {
return sDeviceOwnerComponentName;
}
+
+ @Implementation
+ public static int getManagedProfileId(UserManager um, int parentUserId) {
+ return UserHandle.USER_NULL;
+ }
}