Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d8bbca authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Use resource processor for SettingsRoboTestStub" into main

parents 3e6c3195 f5335790

tests/robotests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ android_app { 
    platform_apis: true,

    certificate: "platform",

    privileged: true,



    use_resource_processor: true,

    resource_dirs: ["res"],



    static_libs: [

tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/core/CategoryMixinTest.java

+1 −2
Original line number Diff line number Diff line
@@ -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);

        }

tests/robotests/src/com/android/settings/dashboard/profileselector/UserAdapterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;