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

Use resource processor for SettingsRoboTestStub

Browse Source 
Bug: 293810334
Test: m RunSettingsRoboTests
Change-Id: Ie063a19695e54619ef511b86e0bbed2c2db45a3e
This commit is contained in:
Chaohui Wang
2023-08-16 13:28:02 +08:00
parent 5c739de558
commit f5335790bb
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/Android.bp
View File

@@ -17,7 +17,7 @@ android_app {
platform_apis: true, platform_apis: true,
certificate: "platform", certificate: "platform",
privileged: true, privileged: true,
use_resource_processor: true,
resource_dirs: ["res"], resource_dirs: ["res"],
static_libs: [ static_libs: [

2
tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java
View File

@@ -117,7 +117,7 @@ public class AccessibilityFooterPreferenceControllerTest {
mPreference.onBindViewHolder(mPreferenceViewHolder); mPreference.onBindViewHolder(mPreferenceViewHolder);
final TextView learnMoreView = (TextView) 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.getContentDescription()).isNull();
assertThat(learnMoreView.getVisibility()).isEqualTo(View.GONE); assertThat(learnMoreView.getVisibility()).isEqualTo(View.GONE);
assertThat(mPreference.isLinkEnabled()).isFalse(); assertThat(mPreference.isLinkEnabled()).isFalse();

2
tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
View File

@@ -110,7 +110,7 @@ public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest {
mPreference.setTitle(TEST_TITLE); mPreference.setTitle(TEST_TITLE);
LayoutInflater inflater = LayoutInflater.from(mContext); LayoutInflater inflater = LayoutInflater.from(mContext);
mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate( 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); LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
inflater.inflate(R.layout.preference_widget_primary_switch, mWidgetView, true); inflater.inflate(R.layout.preference_widget_primary_switch, mWidgetView, true);
mPreference.onBindViewHolder(mHolder); mPreference.onBindViewHolder(mHolder);

3
tests/robotests/src/com/android/settings/core/CategoryMixinTest.java
View File

@@ -32,7 +32,6 @@ import androidx.appcompat.app.AppCompatActivity;
import com.android.settings.core.CategoryMixin.CategoryListener; import com.android.settings.core.CategoryMixin.CategoryListener;
import com.android.settings.utils.ActivityControllerWrapper; import com.android.settings.utils.ActivityControllerWrapper;
import com.android.settingslib.R;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -89,7 +88,7 @@ public class CategoryMixinTest {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setTheme(R.style.Theme_AppCompat); setTheme(androidx.appcompat.R.style.Theme_AppCompat);
mCategoryMixin = new CategoryMixin(this); mCategoryMixin = new CategoryMixin(this);
getLifecycle().addObserver(mCategoryMixin); getLifecycle().addObserver(mCategoryMixin);
} }

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

@@ -32,7 +32,7 @@ import android.widget.TextView;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.RecyclerView; import com.android.internal.widget.RecyclerView;
import com.android.settingslib.R; import com.android.settings.R;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;

2
tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
View File

@@ -91,7 +91,7 @@ public class AppDataUsagePreferenceTest {
mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem, mPreference = new AppDataUsagePreference(RuntimeEnvironment.application, mAppItem,
50 /* percent */, mUidDetailProvider); 50 /* percent */, mUidDetailProvider);
final View view = LayoutInflater.from(RuntimeEnvironment.application).inflate( 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 = final PreferenceViewHolder preferenceViewHolder =
PreferenceViewHolder.createInstanceForTests(view); PreferenceViewHolder.createInstanceForTests(view);
final ProgressBar progressBar = (ProgressBar) preferenceViewHolder.findViewById( final ProgressBar progressBar = (ProgressBar) preferenceViewHolder.findViewById(

2
tests/robotests/src/com/android/settings/widget/SettingsMainSwitchBarTest.java
View File

@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.widget.TextView; import android.widget.TextView;
import com.android.settingslib.R; import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before; import org.junit.Before;