AOD: Ambient display settings to dedicated settings screen

Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b

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

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;

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;
+    }
+}

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);
+                }
+            };
+}