Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c
.
Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
This commit is contained in:
@@ -16,25 +16,9 @@
|
||||
|
||||
package com.android.settings.display;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Handler;
|
||||
import android.os.IPowerManager;
|
||||
import android.os.PowerManager;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import org.junit.Assert;
|
||||
import com.android.settings.display.darkmode.DarkModePreference;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -43,6 +27,10 @@ import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class DarkUIPreferenceControllerTest {
|
||||
|
||||
@@ -57,7 +45,7 @@ public class DarkUIPreferenceControllerTest {
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
mController = spy(new DarkUIPreferenceController(mContext, "dark_ui_mode"));
|
||||
mController.setParentFragment(mFragment);
|
||||
mController.mPreference = new SwitchPreference(mContext);
|
||||
mController.mPreference = new DarkModePreference(mContext, null /* AttributeSet attrs */);
|
||||
mController.onStart();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user