From f5335790bbba2b2fb976f06a935d3eb254585e18 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 16 Aug 2023 13:28:02 +0800 Subject: [PATCH] Use resource processor for SettingsRoboTestStub Bug: 293810334 Test: m RunSettingsRoboTests Change-Id: Ie063a19695e54619ef511b86e0bbed2c2db45a3e --- tests/robotests/Android.bp | 2 +- .../AccessibilityFooterPreferenceControllerTest.java | 2 +- ...lityQuickSettingsPrimarySwitchPreferenceControllerTest.java | 2 +- .../src/com/android/settings/core/CategoryMixinTest.java | 3 +-- .../settings/dashboard/profileselector/UserAdapterTest.java | 2 +- .../android/settings/datausage/AppDataUsagePreferenceTest.java | 2 +- .../com/android/settings/widget/SettingsMainSwitchBarTest.java | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index 2bd8721d70e..83ab12893e1 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -17,7 +17,7 @@ android_app { platform_apis: true, certificate: "platform", privileged: true, - + use_resource_processor: true, resource_dirs: ["res"], static_libs: [ diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java index 95c4b778369..111f634e2c9 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java @@ -117,7 +117,7 @@ public class AccessibilityFooterPreferenceControllerTest { mPreference.onBindViewHolder(mPreferenceViewHolder); final TextView learnMoreView = (TextView) mPreferenceViewHolder - .findViewById(com.android.settingslib.R.id.settingslib_learn_more); + .findViewById(com.android.settingslib.widget.R.id.settingslib_learn_more); assertThat(learnMoreView.getContentDescription()).isNull(); assertThat(learnMoreView.getVisibility()).isEqualTo(View.GONE); assertThat(mPreference.isLinkEnabled()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java index 8174541ebd2..5712d0fea75 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java @@ -110,7 +110,7 @@ public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest { mPreference.setTitle(TEST_TITLE); LayoutInflater inflater = LayoutInflater.from(mContext); mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate( - com.android.settingslib.R.layout.preference_two_target, null)); + com.android.settingslib.widget.R.layout.preference_two_target, null)); LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame); inflater.inflate(R.layout.preference_widget_primary_switch, mWidgetView, true); mPreference.onBindViewHolder(mHolder); diff --git a/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java b/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java index a0ae9f78739..d8f4a90382e 100644 --- a/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java +++ b/tests/robotests/src/com/android/settings/core/CategoryMixinTest.java @@ -32,7 +32,6 @@ import androidx.appcompat.app.AppCompatActivity; import com.android.settings.core.CategoryMixin.CategoryListener; import com.android.settings.utils.ActivityControllerWrapper; -import com.android.settingslib.R; import org.junit.Before; import org.junit.Test; @@ -89,7 +88,7 @@ public class CategoryMixinTest { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTheme(R.style.Theme_AppCompat); + setTheme(androidx.appcompat.R.style.Theme_AppCompat); mCategoryMixin = new CategoryMixin(this); getLifecycle().addObserver(mCategoryMixin); } diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java index aa7e30af809..2fb5e03fa7c 100644 --- a/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java @@ -32,7 +32,7 @@ import android.widget.TextView; import androidx.test.core.app.ApplicationProvider; import com.android.internal.widget.RecyclerView; -import com.android.settingslib.R; +import com.android.settings.R; import com.google.android.collect.Lists; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index ad41638b37d..0b182b85871 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -91,7 +91,7 @@ public class AppDataUsagePreferenceTest { mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem, 50 /* percent */, mUidDetailProvider); final View view = LayoutInflater.from(RuntimeEnvironment.application).inflate( - com.android.settingslib.R.layout.preference_app, null); + com.android.settingslib.widget.R.layout.preference_app, null); final PreferenceViewHolder preferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view); final ProgressBar progressBar = (ProgressBar) preferenceViewHolder.findViewById( diff --git a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchBarTest.java index dc69d8e0dfb..49b7840a438 100644 --- a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchBarTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.widget.TextView; -import com.android.settingslib.R; +import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before;