Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac14708 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge "Move AmbientDisplayConfiguration class out of internal package."

parents 6391c9b6 fd85a9fa

src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
package com.android.settings.display;



import android.content.Context;

import android.hardware.display.AmbientDisplayConfiguration;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.core.TogglePreferenceController;



public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {

src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import static android.provider.Settings.Secure.DOZE_ENABLED; 


import android.app.settings.SettingsEnums;

import android.content.Context;

import android.hardware.display.AmbientDisplayConfiguration;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;
@@ -24,7 +25,6 @@ import android.text.TextUtils; 
import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java

+1 −2
Original line number Diff line number Diff line
@@ -21,14 +21,13 @@ import static android.provider.Settings.Secure.DOZE_DOUBLE_TAP_GESTURE; 
import android.annotation.UserIdInt;

import android.content.Context;

import android.content.SharedPreferences;

import android.hardware.display.AmbientDisplayConfiguration;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;



import com.android.internal.hardware.AmbientDisplayConfiguration;



public class DoubleTapScreenPreferenceController extends GesturePreferenceController {



    private final int ON = 1;

src/com/android/settings/gestures/DoubleTapScreenSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ package com.android.settings.gestures; 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.SharedPreferences;

import android.hardware.display.AmbientDisplayConfiguration;

import android.provider.SearchIndexableResource;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;

src/com/android/settings/gestures/GestureSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.settings.gestures; 


import android.app.settings.SettingsEnums;

import android.content.Context;

import android.hardware.display.AmbientDisplayConfiguration;

import android.provider.SearchIndexableResource;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;