diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..7b4f062a62b85b5dc4854bc31dd3696e2bbc8e2f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +include: 'https://gitlab.e.foundation/e/os/build_module/raw/master/.gitlab-ci.yml' + + +variables: + REPO_BRANCH: eelo-0.2 + REPO_DIRECTORY: EELO_0_2 + REPO_URL: https://gitlab.e.foundation/e/os/android.git + PROJECT_PATH: packages/apps/Settings diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index c56438fcedf3ae454c5d4f40bbfbe681d25beef0..0f8e7e4643a9b9572c589351305bf37253839041 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -105,10 +105,6 @@ public class SettingsShadowResources extends ShadowResources { // TODO: Remove this once Robolectric is updated. if (id == R.drawable.switchbar_background) { return new ColorDrawable(); - } 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 = 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) {