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

Update theme setting to not require reboot

Browse Source 
Add calls into the OverlayManagerService to update the overlays
directly and remove reboot dialog.

Test: make RunSettingsRobotTests
Change-Id: I92841e643eab70b4b194f60cce95ce3cedb75972
Fixes: 34701451
This commit is contained in:
Jason Monk
2017-03-07 15:59:36 -05:00
parent 69ef3f4e69
commit 2859b9a302
5 changed files with 199 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
View File

@@ -17,10 +17,15 @@
package com.android.settings.display;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.support.v7.preference.ListPreference;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.display.ThemePreferenceController.OverlayManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,9 +33,13 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -40,24 +49,19 @@ public class ThemePreferenceControllerTest {
private ListPreference mPreference;
@Mock
private Context mContext;
@Mock
private PackageManager mPackageManager;
@Mock
private ApplicationInfo mApplicationInfo;
private ThemePreferenceController mController;
@Before
public void setUp() {
public void setUp() throws NameNotFoundException {
MockitoAnnotations.initMocks(this);
mController = spy(new ThemePreferenceController(mContext));
}
@Test
public void updateState_nullTheme_shouldSetSummaryToDefault() {
final String[] themes = {"Theme1", "Theme2"};
doReturn(null).when(mController).getCurrentTheme();
doReturn(themes).when(mController).getAvailableThemes();
mController.updateState(mPreference);
verify(mPreference).setSummary(mContext.getString(R.string.default_theme));
when(mPackageManager.getApplicationInfo(any(), anyInt())).thenReturn(mApplicationInfo);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
mController = spy(new ThemePreferenceController(mContext, mock(OverlayManager.class)));
}
@Test