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

Commit 9f0efa68 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Fix some out-of-order imports 

Bug: 20188695
Test: build
Change-Id: I47d463f82bee4e1b22300eb4260dd38dbeb13c88
parent 236eaed3

src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ import android.content.Context; 
import android.os.UserHandle;

import android.provider.Settings;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.RestrictedListPreference;

import com.android.settings.core.PreferenceControllerMixin;
@@ -34,9 +37,6 @@ import com.google.common.annotations.VisibleForTesting; 


import java.util.ArrayList;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



public class ShowOnLockScreenNotificationPreferenceController extends AbstractPreferenceController

        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java

+2 −3
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.provider.Settings;



import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.RestrictedListPreference;

import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
@@ -42,11 +44,8 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.Shadows;

import org.robolectric.annotation.Config;



import androidx.preference.PreferenceScreen;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUserManager.class, ShadowRestrictedLockUtilsInternal.class})

public class ShowOnLockscreenNotificationPreferenceControllerTest {