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

Merge "Misc GAR fixes" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-22 03:08:15 +00:00
committed by Android (Google) Code Review
parent 346063dd5c 3ab53bbd7b
commit c9d258a11e
7 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package com.android.settings.testutils.shadow;
import static android.util.TypedValue.TYPE_REFERENCE;
import static org.robolectric.RuntimeEnvironment.application;
import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.shadow.api.Shadow.directlyOn;
@@ -122,8 +121,6 @@ public class SettingsShadowResources extends ShadowResources {
id = R.drawable.ic_settings_wireless;
} else if (id == R.drawable.app_filter_spinner_background) {
id = R.drawable.ic_expand_more_inverse;
} else if (id == R.drawable.selectable_card_grey) {
id = R.drawable.ic_expand_more_inverse;
}
return super.loadDrawable(value, id, theme);
}

2
tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
View File

@@ -50,8 +50,6 @@ public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
id = R.drawable.ic_settings_wireless;
} else if (id == R.drawable.app_filter_spinner_background) {
id = R.drawable.ic_expand_more_inverse;
} else if (id == R.drawable.selectable_card_grey) {
id = R.drawable.ic_expand_more_inverse;
} else if (id == R.drawable.color_bar_progress
|| id == R.drawable.ring_progress) {
// color_bar_progress and ring_progress use hidden resources, so just use the regular