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

Merge "Move AmbientDisplayConfiguration class out of internal package."

Browse Source
This commit is contained in:
Issei Suzuki
2019-02-27 14:28:36 +00:00
committed by Android (Google) Code Review
parent 6391c9b6e4 fd85a9fae6
commit 1ac14708e8
18 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
View File

@@ -23,9 +23,9 @@ import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
import android.provider.Settings;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;

2
tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
View File

@@ -29,12 +29,12 @@ import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

2
tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
View File

@@ -26,8 +26,8 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.display.AmbientDisplayConfiguration;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import org.junit.Before;

2
tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
View File

@@ -26,8 +26,8 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.display.AmbientDisplayConfiguration;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import org.junit.Before;

3
tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java
View File

@@ -25,8 +25,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import android.hardware.display.AmbientDisplayConfiguration;
import org.junit.Before;
import org.junit.Test;

2
tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java
View File

@@ -28,8 +28,8 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;