From e349ec30d81096930a9cbabe125360245a98b7a0 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Thu, 25 May 2017 15:49:35 -0700
Subject: [PATCH] AOD: Ambient display settings to dedicated settings screen

Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
---
 res/values/strings.xml                        |  31 +++--
 res/xml/ambient_display_settings.xml          |  51 ++++++++
 res/xml/display_settings.xml                  |  25 +---
 src/com/android/settings/DisplaySettings.java |  20 +--
 ...tDisplayAlwaysOnPreferenceController.java} |  11 +-
 ...layNotificationsPreferenceController.java} |  14 +--
 .../AmbientDisplayPreferenceController.java   |  64 ++++++++++
 .../display/AmbientDisplaySettings.java       | 107 ++++++++++++++++
 .../search/SearchIndexableResources.java      |   2 +
 .../hardware/AmbientDisplayConfiguration.java |   8 ++
 ...playAlwaysOnPreferenceControllerTest.java} |   6 +-
 ...otificationsPreferenceControllerTest.java} |  10 +-
 ...mbientDisplayPreferenceControllerTest.java | 117 ++++++++++++++++++
 .../search/DatabaseIndexingManagerTest.java   |   4 +-
 14 files changed, 402 insertions(+), 68 deletions(-)
 create mode 100644 res/xml/ambient_display_settings.xml
 rename src/com/android/settings/display/{DozeAlwaysOnPreferenceController.java => AmbientDisplayAlwaysOnPreferenceController.java} (82%)
 rename src/com/android/settings/display/{DozePreferenceController.java => AmbientDisplayNotificationsPreferenceController.java} (81%)
 create mode 100644 src/com/android/settings/display/AmbientDisplayPreferenceController.java
 create mode 100644 src/com/android/settings/display/AmbientDisplaySettings.java
 rename tests/robotests/src/com/android/settings/display/{DozeAlwaysOnPreferenceControllerTest.java => AmbientDisplayAlwaysOnPreferenceControllerTest.java} (93%)
 rename tests/robotests/src/com/android/settings/display/{DozePreferenceControllerTest.java => AmbientDisplayNotificationsPreferenceControllerTest.java} (91%)
 create mode 100644 tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 546259c0919..846889f437c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2424,9 +2424,18 @@
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
     <string name="lift_to_wake_title">Lift to wake</string>
-    <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
-    <string name="doze_title">Ambient display</string>
-    <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+
+    <!-- [CHAR LIMIT=30] Title of the preference that opens the Ambient display settings screen. -->
+    <string name="ambient_display_screen_title">Ambient display</string>
+    <!-- [CHAR LIMIT=30] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to be always on -->
+    <string name="ambient_display_screen_summary_always_on">Always on</string>
+    <!-- [CHAR LIMIT=30] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to show when new notifications come in. -->
+    <string name="ambient_display_screen_summary_notifications">New notifications</string>
+    <!-- [CHAR LIMIT=30] Category title for the settings that control when Ambient display shows. -->
+    <string name="ambient_display_category_triggers">When to show</string>
+    <!-- [CHAR LIMIT=30] Ambient display screen, title for setting to change whether the ambient display feature is triggered for new incoming notifications. -->
+    <string name="doze_title">New notifications</string>
+    <!-- [CHAR LIMIT=NONE] Ambient display screen, summary for setting to change whether the ambient display feature is triggered for new incoming notifications. -->
     <string name="doze_summary">Wake screen when you receive notifications</string>
     <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the always-on ambient display feature is enabled. -->
     <string name="doze_always_on_title">Always on</string>
@@ -8464,8 +8473,8 @@
     <!-- Title text for ambient display double tap (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="device">Double-tap to check device</string>
 
-    <!-- Summary text for ambient display double tap [CHAR LIMIT=160]-->
-    <string name="ambient_display_summary">To quickly check your notifications, double-tap your screen.</string>
+    <!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_summary">To check time, notification icons, and other info, double-tap your screen.</string>
 
     <!-- Title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="default">Lift to check phone</string>
@@ -8474,12 +8483,12 @@
     <!-- Title text for ambient display pick up (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="device">Lift to check device</string>
 
-    <!-- Summary text for ambient display (phone) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="default">To quickly check your notifications, pick up your phone.</string>
-    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="tablet">To quickly check your notifications, pick up your tablet.</string>
-    <!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device.</string>
+    <!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="default">To check time, notification icons, and other info, pick up your phone.</string>
+    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="tablet">To check time, notification icons, and other info, pick up your tablet.</string>
+    <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="device">To check time, notification icons, and other info, pick up your device.</string>
 
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
new file mode 100644
index 00000000000..47fed8a8c5f
--- /dev/null
+++ b/res/xml/ambient_display_settings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/ambient_display_screen_title">
+
+    <PreferenceCategory
+            android:title="@string/ambient_display_category_triggers">
+
+        <SwitchPreference
+            android:key="ambient_display_always_on"
+            android:title="@string/doze_always_on_title"
+            android:summary="@string/doze_always_on_summary" />
+
+        <Preference
+            android:key="ambient_display_double_tap"
+            android:title="@string/ambient_display_title"
+            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
+
+        <Preference
+            android:key="ambient_display_pick_up"
+            android:title="@string/ambient_display_pickup_title"
+            android:fragment="com.android.settings.gestures.PickupGestureSettings" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory>
+
+        <SwitchPreference
+            android:key="ambient_display_notification"
+            android:title="@string/doze_title"
+            android:summary="@string/doze_summary" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 749b87d377f..11b26769551 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -78,6 +78,11 @@
         android:title="@string/screensaver_settings_title"
         android:fragment="com.android.settings.dream.DreamSettings" />
 
+    <Preference
+        android:key="ambient_display"
+        android:title="@string/ambient_display_screen_title"
+        android:fragment="com.android.settings.display.AmbientDisplaySettings" />
+
     <!-- Hide night mode for now
     <ListPreference
         android:key="night_mode"
@@ -96,26 +101,6 @@
         android:key="lift_to_wake"
         android:title="@string/lift_to_wake_title" />
 
-    <Preference
-        android:key="gesture_double_tap_screen_display_summary"
-        android:title="@string/ambient_display_title"
-        android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
-
-    <Preference
-        android:key="gesture_pick_up_display_summary"
-        android:title="@string/ambient_display_pickup_title"
-        android:fragment="com.android.settings.gestures.PickupGestureSettings" />
-
-    <SwitchPreference
-        android:key="doze"
-        android:title="@string/doze_title"
-        android:summary="@string/doze_summary" />
-
-    <SwitchPreference
-        android:key="doze_always_on"
-        android:title="@string/doze_always_on_title"
-        android:summary="@string/doze_always_on_summary" />
-
     <SwitchPreference
         android:key="tap_to_wake"
         android:title="@string/tap_to_wake"
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 26503e40f3e..1b54f97c855 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -17,19 +17,17 @@
 package com.android.settings;
 
 import android.content.Context;
-import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.display.AmbientDisplayPreferenceController;
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.AutoRotatePreferenceController;
 import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
-import com.android.settings.display.DozeAlwaysOnPreferenceController;
-import com.android.settings.display.DozePreferenceController;
 import com.android.settings.display.FontSizePreferenceController;
 import com.android.settings.display.LiftToWakePreferenceController;
 import com.android.settings.display.NightDisplayPreferenceController;
@@ -40,9 +38,6 @@ import com.android.settings.display.ThemePreferenceController;
 import com.android.settings.display.TimeoutPreferenceController;
 import com.android.settings.display.VrDisplayPreferenceController;
 import com.android.settings.display.WallpaperPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -57,8 +52,7 @@ public class DisplaySettings extends DashboardFragment {
     public static final String KEY_DISPLAY_SIZE = "screen_zoom";
 
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
-    private static final String KEY_PICK_UP = "gesture_pick_up_display_summary";
-    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_display_summary";
+    private static final String KEY_AMBIENT_DISPLAY = "ambient_display";
 
     @Override
     public int getMetricsCategory() {
@@ -98,19 +92,13 @@ public class DisplaySettings extends DashboardFragment {
         controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
         controllers.add(new AutoRotatePreferenceController(context, lifecycle));
         controllers.add(new CameraGesturePreferenceController(context));
-        controllers.add(new DozePreferenceController(context, ambientDisplayConfig,
-                FeatureFactory.getFactory(context).getMetricsFeatureProvider()));
-        controllers.add(new DozeAlwaysOnPreferenceController(context, ambientDisplayConfig));
         controllers.add(new FontSizePreferenceController(context));
         controllers.add(new LiftToWakePreferenceController(context));
         controllers.add(new NightDisplayPreferenceController(context));
         controllers.add(new NightModePreferenceController(context));
         controllers.add(new ScreenSaverPreferenceController(context));
-        controllers.add(new PickupGesturePreferenceController(
-                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId(), KEY_PICK_UP));
-        controllers.add(new DoubleTapScreenPreferenceController(
-                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId(),
-                KEY_DOUBLE_TAP_SCREEN));
+        controllers.add(new AmbientDisplayPreferenceController(context, ambientDisplayConfig,
+                KEY_AMBIENT_DISPLAY));
         controllers.add(new TapToWakePreferenceController(context));
         controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
         controllers.add(new VrDisplayPreferenceController(context));
diff --git a/src/com/android/settings/display/DozeAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
similarity index 82%
rename from src/com/android/settings/display/DozeAlwaysOnPreferenceController.java
rename to src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index e3e2e2d4e63..bed04d3591f 100644
--- a/src/com/android/settings/display/DozeAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -27,22 +27,23 @@ import android.support.v7.preference.Preference;
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.core.PreferenceController;
 
-public class DozeAlwaysOnPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener {
 
-    private static final String KEY_DOZE_ALWAYS_ON = "doze_always_on";
+    private static final String KEY_ALWAYS_ON = "ambient_display_always_on";
     private static final int MY_USER = UserHandle.myUserId();
 
     private final AmbientDisplayConfiguration mConfig;
 
-    public DozeAlwaysOnPreferenceController(Context context, AmbientDisplayConfiguration config) {
+    public AmbientDisplayAlwaysOnPreferenceController(Context context,
+            AmbientDisplayConfiguration config) {
         super(context);
         mConfig = config;
     }
 
     @Override
     public String getPreferenceKey() {
-        return KEY_DOZE_ALWAYS_ON;
+        return KEY_ALWAYS_ON;
     }
 
     @Override
diff --git a/src/com/android/settings/display/DozePreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
similarity index 81%
rename from src/com/android/settings/display/DozePreferenceController.java
rename to src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index 36c850ea948..9e15afb2e28 100644
--- a/src/com/android/settings/display/DozePreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -27,18 +27,18 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import static android.provider.Settings.Secure.DOZE_ENABLED;
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
 
-public class DozePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class AmbientDisplayNotificationsPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener {
 
     @VisibleForTesting
-    static final String KEY_DOZE = "doze";
+    static final String KEY_AMBIENT_DISPLAY_NOTIFICATIONS = "ambient_display_notification";
     private static final int MY_USER = UserHandle.myUserId();
 
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final AmbientDisplayConfiguration mConfig;
 
-    public DozePreferenceController(Context context, AmbientDisplayConfiguration config,
-            MetricsFeatureProvider metricsFeatureProvider) {
+    public AmbientDisplayNotificationsPreferenceController(Context context,
+            AmbientDisplayConfiguration config, MetricsFeatureProvider metricsFeatureProvider) {
         super(context);
         mMetricsFeatureProvider = metricsFeatureProvider;
         mConfig = config;
@@ -46,12 +46,12 @@ public class DozePreferenceController extends PreferenceController implements
 
     @Override
     public String getPreferenceKey() {
-        return KEY_DOZE;
+        return KEY_AMBIENT_DISPLAY_NOTIFICATIONS;
     }
 
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_DOZE.equals(preference.getKey())) {
+        if (KEY_AMBIENT_DISPLAY_NOTIFICATIONS.equals(preference.getKey())) {
             mMetricsFeatureProvider.action(mContext, ACTION_AMBIENT_DISPLAY);
         }
         return false;
diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
new file mode 100644
index 00000000000..f3e3046fbd6
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
@@ -0,0 +1,64 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.app.NightDisplayController;
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class AmbientDisplayPreferenceController extends PreferenceController {
+
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private final AmbientDisplayConfiguration mConfig;
+    private final String mKey;
+
+    public AmbientDisplayPreferenceController(Context context, AmbientDisplayConfiguration config,
+            String key) {
+        super(context);
+        mConfig = config;
+        mKey = key;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfig.available();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (mConfig.alwaysOnEnabled(MY_USER_ID)) {
+            preference.setSummary(R.string.ambient_display_screen_summary_always_on);
+        } else if (mConfig.pulseOnNotificationEnabled(MY_USER_ID)) {
+            preference.setSummary(R.string.ambient_display_screen_summary_notifications);
+        } else if (mConfig.enabled(MY_USER_ID)) {
+            preference.setSummary(R.string.switch_on_text);
+        } else {
+            preference.setSummary(R.string.switch_off_text);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mKey;
+    }
+}
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
new file mode 100644
index 00000000000..011cccbd877
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplaySettings.java
@@ -0,0 +1,107 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.gestures.DoubleTapScreenPreferenceController;
+import com.android.settings.gestures.PickupGesturePreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Settings screen for Ambient display.
+ */
+public class AmbientDisplaySettings extends DashboardFragment {
+
+    private static final String TAG = "AmbientDisplaySettings";
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
+    private static final String KEY_AMBIENT_DISPLAY_DOUBLE_TAP = "ambient_display_double_tap";
+    private static final String KEY_AMBIENT_DISPLAY_PICK_UP = "ambient_display_pick_up";
+    private static final String KEY_AMBIENT_DISPLAY_NOTIFICATION = "ambient_display_notification";
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle, AmbientDisplayConfiguration config,
+            MetricsFeatureProvider metricsFeatureProvider) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
+                metricsFeatureProvider));
+        controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config));
+        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle, config,
+                MY_USER_ID, KEY_AMBIENT_DISPLAY_DOUBLE_TAP));
+        controllers.add(new PickupGesturePreferenceController(context, lifecycle, config,
+                MY_USER_ID, KEY_AMBIENT_DISPLAY_PICK_UP));
+        return controllers;
+    }
+
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.ambient_display_settings;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle(),
+                new AmbientDisplayConfiguration(context), mMetricsFeatureProvider);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.AMBIENT_DISPLAY_SETTINGS;
+    }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.ambient_display_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null,
+                            new AmbientDisplayConfiguration(context), null);
+                }
+            };
+}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index ab1af49ff83..963aff4e7d4 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -47,6 +47,7 @@ import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
+import com.android.settings.display.AmbientDisplaySettings;
 import com.android.settings.display.ScreenZoomSettings;
 import com.android.settings.dream.DreamSettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -117,6 +118,7 @@ public final class SearchIndexableResources {
         addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
+        addIndex(AmbientDisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(WallpaperTypeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(ConfigureNotificationSettings.class,
                 R.xml.configure_notification_settings, R.drawable.ic_settings_notifications);
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
index 9ac077dbde1..7e3cd84bfbf 100644
--- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -57,4 +57,12 @@ public class AmbientDisplayConfiguration {
     public boolean alwaysOnAvailable() {
         return true;
     }
+
+    public boolean available() {
+        return true;
+    }
+
+    public boolean enabled(int user) {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/DozeAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/display/DozeAlwaysOnPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index fc299c04972..c89e29f847a 100644
--- a/tests/robotests/src/com/android/settings/display/DozeAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -41,18 +41,18 @@ import org.robolectric.annotation.Config;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
         shadows = {ShadowSecureSettings.class})
-public class DozeAlwaysOnPreferenceControllerTest {
+public class AmbientDisplayAlwaysOnPreferenceControllerTest {
 
     @Mock Context mContext;
     @Mock AmbientDisplayConfiguration mConfig;
     @Mock SwitchPreference mSwitchPreference;
 
-    DozeAlwaysOnPreferenceController mController;
+    AmbientDisplayAlwaysOnPreferenceController mController;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mController = new DozeAlwaysOnPreferenceController(mContext, mConfig);
+        mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/display/DozePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/display/DozePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
index a956945e254..1997198a01b 100644
--- a/tests/robotests/src/com/android/settings/display/DozePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -47,19 +47,20 @@ import org.robolectric.annotation.Config;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
         shadows = {ShadowSecureSettings.class})
-public class DozePreferenceControllerTest {
+public class AmbientDisplayNotificationsPreferenceControllerTest {
 
     @Mock Context mContext;
     @Mock AmbientDisplayConfiguration mConfig;
     @Mock SwitchPreference mSwitchPreference;
     @Mock MetricsFeatureProvider mMetricsFeatureProvider;
 
-    DozePreferenceController mController;
+    AmbientDisplayNotificationsPreferenceController mController;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mController = new DozePreferenceController(mContext, mConfig, mMetricsFeatureProvider);
+        mController = new AmbientDisplayNotificationsPreferenceController(mContext, mConfig,
+                mMetricsFeatureProvider);
     }
 
     @Test
@@ -116,7 +117,8 @@ public class DozePreferenceControllerTest {
 
     @Test
     public void handlePreferenceTreeClick_reportsEventForItsPreference() throws Exception {
-        when(mSwitchPreference.getKey()).thenReturn(DozePreferenceController.KEY_DOZE);
+        when(mSwitchPreference.getKey()).thenReturn(
+                AmbientDisplayNotificationsPreferenceController.KEY_AMBIENT_DISPLAY_NOTIFICATIONS);
 
         mController.handlePreferenceTreeClick(mSwitchPreference);
 
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
new file mode 100644
index 00000000000..3ae48319c93
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {ShadowSecureSettings.class})
+public class AmbientDisplayPreferenceControllerTest {
+
+    @Mock Context mContext;
+    @Mock AmbientDisplayConfiguration mConfig;
+    @Mock Preference mPreference;
+
+    AmbientDisplayPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mController = new AmbientDisplayPreferenceController(mContext, mConfig, "key");
+    }
+
+    @Test
+    public void isAvailable_available() throws Exception {
+        when(mConfig.available()).thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_unavailable() throws Exception {
+        when(mConfig.available()).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_alwaysOn() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_always_on);
+    }
+
+    @Test
+    public void updateState_notifications() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_notifications);
+    }
+
+    @Test
+    public void updateState_gestures() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+        when(mConfig.enabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.switch_on_text);
+    }
+
+    @Test
+    public void updateState_off() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnPickupEnabled(anyInt())).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.switch_off_text);
+    }
+
+    @Test
+    public void getPreferenceKey() throws Exception {
+        assertThat(mController.getPreferenceKey()).isEqualTo("key");
+    }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index ab8891b2c69..82f42145f37 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -263,7 +263,7 @@ public class DatabaseIndexingManagerTest {
         SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(19);
+        assertThat(cursor.getCount()).isEqualTo(16);
     }
 
     @Test
@@ -278,7 +278,7 @@ public class DatabaseIndexingManagerTest {
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
         assertThat(cursor.getCount()).isEqualTo(2);
         cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(17);
+        assertThat(cursor.getCount()).isEqualTo(14);
     }
 
     @Test