diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 902d5e0b9f329..53cf4639f11b8 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2376,6 +2376,12 @@ + + + + + + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 30a196395b353..c232a8a474bda 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2221,6 +2221,8 @@ + + diff --git a/packages/SettingsLib/res/values/config.xml b/packages/SettingsLib/res/values/config.xml index b150e0169a962..45253bb7944af 100644 --- a/packages/SettingsLib/res/values/config.xml +++ b/packages/SettingsLib/res/values/config.xml @@ -28,9 +28,4 @@ false - - - - - \ No newline at end of file diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java index 6bf43e5280094..a000c099347d1 100644 --- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java +++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java @@ -151,13 +151,13 @@ public class DreamBackend { .map(ComponentName::unflattenFromString) .collect(Collectors.toSet()); - mSupportedComplications = - Arrays.stream(resources.getIntArray(R.array.config_supportedDreamComplications)) - .boxed() - .collect(Collectors.toSet()); + mSupportedComplications = Arrays.stream(resources.getIntArray( + com.android.internal.R.array.config_supportedDreamComplications)) + .boxed() + .collect(Collectors.toSet()); - mDefaultEnabledComplications = Arrays.stream( - resources.getIntArray(R.array.config_dreamComplicationsEnabledByDefault)) + mDefaultEnabledComplications = Arrays.stream(resources.getIntArray( + com.android.internal.R.array.config_dreamComplicationsEnabledByDefault)) .boxed() // A complication can only be enabled by default if it is also supported. .filter(mSupportedComplications::contains) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java index 53d465305a69e..86f7850cf1f24 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import com.android.settingslib.R; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -53,10 +51,15 @@ public final class DreamBackendTest { final Resources res = mock(Resources.class); when(mContext.getResources()).thenReturn(res); - when(res.getIntArray(R.array.config_supportedDreamComplications)).thenReturn( + when(res.getIntArray( + com.android.internal.R.array.config_supportedDreamComplications)).thenReturn( SUPPORTED_DREAM_COMPLICATIONS); - when(res.getIntArray(R.array.config_dreamComplicationsEnabledByDefault)).thenReturn( + when(res.getIntArray( + com.android.internal.R.array.config_dreamComplicationsEnabledByDefault)).thenReturn( DEFAULT_DREAM_COMPLICATIONS); + when(res.getStringArray( + com.android.internal.R.array.config_disabledDreamComponents)).thenReturn( + new String[]{}); mBackend = new DreamBackend(mContext); }