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

Update theme for filter widget.

Browse Source 
Bug: 35933748
Test: visual

Change-Id: I0c09c90360c436e25ca4a40993dde31cb2b4287b
This commit is contained in:
Fan Zhang
2017-03-02 16:53:15 -08:00
parent 430c8d37d0
commit 3ca5e45425
6 changed files with 126 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
View File

@@ -10,6 +10,9 @@ import android.graphics.drawable.Drawable;
import android.support.annotation.ArrayRes;
import android.util.AttributeSet;
import android.util.TypedValue;
import com.android.settings.R;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@@ -36,7 +39,8 @@ import static org.robolectric.internal.Shadow.directlyOn;
@Implements(Resources.class)
public class SettingsShadowResources extends ShadowResources {
@RealObject public Resources realResources;
@RealObject
public Resources realResources;
@Implementation
public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException {
@@ -54,12 +58,14 @@ public class SettingsShadowResources extends ShadowResources {
// The drawable item in switchbar_background.xml refers to a very recent color attribute
// that Robolectric isn't yet aware of.
// TODO: Remove this once Robolectric is updated.
if (id == com.android.settings.R.drawable.switchbar_background) {
if (id == R.drawable.switchbar_background) {
return new ColorDrawable();
} else if (id == com.android.settings.R.drawable.ic_launcher_settings) {
} else if (id == R.drawable.ic_launcher_settings) {
// ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
// change it to a normal drawable.
id = com.android.settings.R.drawable.ic_settings_wireless;
id = R.drawable.ic_settings_wireless;
} else if (id == R.drawable.app_filter_spinner_background) {
id = R.drawable.ic_expand_more_inverse;
}
return super.loadDrawable(value, id, theme);
}