Enable use_resource_processor for all sysui deps
This will make the build faster
Test: m checkbuild
Bug: 295208392
Change-Id: I675bea822a46fa9adda6c13589a20aa4d32db6f3
diff --git a/packages/SettingsLib/tests/integ/Android.bp b/packages/SettingsLib/tests/integ/Android.bp
index 8970deb..b03c43c 100644
--- a/packages/SettingsLib/tests/integ/Android.bp
+++ b/packages/SettingsLib/tests/integ/Android.bp
@@ -23,6 +23,7 @@
android_test {
name: "SettingsLibTests",
+ use_resource_processor: true,
defaults: [
"SettingsLibDefaults",
"framework-wifi-test-defaults",
diff --git a/packages/SettingsLib/tests/integ/AndroidManifest.xml b/packages/SettingsLib/tests/integ/AndroidManifest.xml
index 2a4dfdd..a95da303 100644
--- a/packages/SettingsLib/tests/integ/AndroidManifest.xml
+++ b/packages/SettingsLib/tests/integ/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.settingslib">
+ package="com.android.settingslib.tests.integ">
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/SettingsSpinnerPreferenceTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/SettingsSpinnerPreferenceTest.java
index b81d13d..c8b20c1 100644
--- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/SettingsSpinnerPreferenceTest.java
+++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/SettingsSpinnerPreferenceTest.java
@@ -28,6 +28,8 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.runner.AndroidJUnit4;
+import com.android.settingslib.widget.spinner.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/UsageProgressBarPreferenceTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/UsageProgressBarPreferenceTest.java
index a9ad00d..a66d3fb 100644
--- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/UsageProgressBarPreferenceTest.java
+++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/UsageProgressBarPreferenceTest.java
@@ -35,6 +35,8 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.runner.AndroidJUnit4;
+import com.android.settingslib.widget.preference.usage.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/Android.bp b/packages/SettingsLib/tests/robotests/Android.bp
index c037c40..dd9cb9c 100644
--- a/packages/SettingsLib/tests/robotests/Android.bp
+++ b/packages/SettingsLib/tests/robotests/Android.bp
@@ -27,6 +27,7 @@
android_app {
name: "SettingsLibShell",
+ use_resource_processor: true,
defaults: ["SettingsLibDefaults"],
platform_apis: true,
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
index 4811d950..e1577e0 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
@@ -182,14 +182,14 @@
final Menu item = mock(Menu.class);
when(item.findItem(MENU_HELP)).thenReturn(null);
when(item.add(0, MENU_HELP, 0,
- com.android.settingslib.widget.R.string.help_feedback_label)).thenReturn(
+ com.android.settingslib.widget.help.R.string.help_feedback_label)).thenReturn(
mock(MenuItem.class));
HelpUtils.prepareHelpMenuItem(mActivity, item, TEST_HELP_URL, "backup_url");
HelpUtils.prepareHelpMenuItem(mActivity, item, 0, "backup_url");
verify(item, times(2)).add(0, MENU_HELP, 0,
- com.android.settingslib.widget.R.string.help_feedback_label);
+ com.android.settingslib.widget.help.R.string.help_feedback_label);
}
@Test
@@ -197,13 +197,13 @@
final Menu item = mock(Menu.class);
when(item.findItem(MENU_HELP)).thenReturn(mock(MenuItem.class));
when(item.add(0, MENU_HELP, 0,
- com.android.settingslib.widget.R.string.help_feedback_label)).thenReturn(
+ com.android.settingslib.widget.help.R.string.help_feedback_label)).thenReturn(
mock(MenuItem.class));
HelpUtils.prepareHelpMenuItem(mActivity, item, TEST_HELP_URL, "backup_url");
HelpUtils.prepareHelpMenuItem(mActivity, item, 0, "backup_url");
verify(item, never()).add(0, MENU_HELP, 0,
- com.android.settingslib.widget.R.string.help_feedback_label);
+ com.android.settingslib.widget.help.R.string.help_feedback_label);
}
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/PrimarySwitchPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/PrimarySwitchPreferenceTest.java
index 32a16716..d9cf9f2 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/PrimarySwitchPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/PrimarySwitchPreferenceTest.java
@@ -54,7 +54,8 @@
mPreference = new PrimarySwitchPreference(mContext);
LayoutInflater inflater = LayoutInflater.from(mContext);
mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
- com.android.settingslib.widget.R.layout.preference_two_target, null));
+ com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target,
+ null));
mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
inflater.inflate(R.layout.preference_widget_primary_switch, mWidgetView, true);
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayoutTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayoutTest.java
index ff84dc9..2b1e808 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayoutTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayoutTest.java
@@ -24,7 +24,7 @@
import androidx.annotation.Nullable;
-import com.android.settingslib.R;
+import com.android.settingslib.collapsingtoolbar.R;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +58,7 @@
View contentFrameView =
layout.findViewById(com.android.settingslib.widget.R.id.content_frame);
- TextView textView = contentFrameView.findViewById(R.id.text_hello_world);
+ TextView textView = contentFrameView.findViewById(com.android.settingslib.robotests.R.id.text_hello_world);
assertThat(textView).isNotNull();
assertThat(textView.getText().toString()).isEqualTo(TEXT_HELLO_WORLD);
@@ -80,8 +80,8 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTheme(android.R.style.Theme_Light_NoTitleBar);
- setContentView(R.layout.collapsing_test_layout);
- mCollapsingCoordinatorLayout = findViewById(R.id.id_collapsing_test);
+ setContentView(com.android.settingslib.robotests.R.layout.collapsing_test_layout);
+ mCollapsingCoordinatorLayout = findViewById(com.android.settingslib.robotests.R.id.id_collapsing_test);
}
public CollapsingCoordinatorLayout getCollapsingCoordinatorLayout() {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionButtonsPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionButtonsPreferenceTest.java
index 9f31cef..6d9261d 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionButtonsPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionButtonsPreferenceTest.java
@@ -31,6 +31,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.actionbuttons.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,10 +57,10 @@
@Test
public void onBindViewHolder_setTitle_shouldShowButtonByDefault() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton2Text(R.string.install_other_apps);
- mPref.setButton3Text(R.string.install_other_apps);
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -107,10 +109,10 @@
@Test
public void onBindViewHolder_setVisibleIsGoneAndSetTitle_shouldNotShowButton() {
- mPref.setButton1Text(R.string.install_other_apps).setButton1Visible(false);
- mPref.setButton2Text(R.string.install_other_apps).setButton2Visible(false);
- mPref.setButton3Text(R.string.install_other_apps).setButton3Visible(false);
- mPref.setButton4Text(R.string.install_other_apps).setButton4Visible(false);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps).setButton1Visible(false);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps).setButton2Visible(false);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps).setButton3Visible(false);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps).setButton4Visible(false);
mPref.onBindViewHolder(mHolder);
@@ -145,10 +147,10 @@
@Test
public void onBindViewHolder_setVisibility_shouldUpdateButtonVisibility() {
- mPref.setButton1Text(R.string.install_other_apps).setButton1Visible(false);
- mPref.setButton2Text(R.string.install_other_apps).setButton2Visible(false);
- mPref.setButton3Text(R.string.install_other_apps).setButton3Visible(false);
- mPref.setButton4Text(R.string.install_other_apps).setButton4Visible(false);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps).setButton1Visible(false);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps).setButton2Visible(false);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps).setButton3Visible(false);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps).setButton4Visible(false);
mPref.onBindViewHolder(mHolder);
@@ -195,26 +197,26 @@
@Test
public void onBindViewHolder_setText_shouldShowSameText() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton2Text(R.string.install_other_apps);
- mPref.setButton3Text(R.string.install_other_apps);
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
assertThat(((Button) mRootView.findViewById(R.id.button1)).getText())
- .isEqualTo(mContext.getText(R.string.install_other_apps));
+ .isEqualTo(mContext.getText(com.android.settingslib.R.string.install_other_apps));
assertThat(((Button) mRootView.findViewById(R.id.button2)).getText())
- .isEqualTo(mContext.getText(R.string.install_other_apps));
+ .isEqualTo(mContext.getText(com.android.settingslib.R.string.install_other_apps));
assertThat(((Button) mRootView.findViewById(R.id.button3)).getText())
- .isEqualTo(mContext.getText(R.string.install_other_apps));
+ .isEqualTo(mContext.getText(com.android.settingslib.R.string.install_other_apps));
assertThat(((Button) mRootView.findViewById(R.id.button4)).getText())
- .isEqualTo(mContext.getText(R.string.install_other_apps));
+ .isEqualTo(mContext.getText(com.android.settingslib.R.string.install_other_apps));
}
@Test
public void onBindViewHolder_setButtonIcon_iconMustDisplayAboveText() {
- mPref.setButton1Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
mPref.setButton1Icon(com.android.internal.R.drawable.ic_plus);
mPref.onBindViewHolder(mHolder);
@@ -227,7 +229,7 @@
@Test
public void setButtonIcon_iconResourceIdIsZero_shouldNotDisplayIcon() {
- mPref.setButton1Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
mPref.setButton1Icon(0);
mPref.onBindViewHolder(mHolder);
@@ -240,7 +242,7 @@
@Test
public void setButtonIcon_iconResourceIdNotExisting_shouldNotDisplayIconAndCrash() {
- mPref.setButton1Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
mPref.setButton1Icon(999999999 /* not existing id */);
// Should not crash here
mPref.onBindViewHolder(mHolder);
@@ -253,10 +255,10 @@
@Test
public void onBindViewHolder_setAllButton_shouldShowAllDivider() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton2Text(R.string.install_other_apps);
- mPref.setButton3Text(R.string.install_other_apps);
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -270,9 +272,9 @@
@Test
public void onBindViewHolder_setAllButtonWithoutButton2_shouldHideDivider1() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton3Text(R.string.install_other_apps);
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -286,9 +288,9 @@
@Test
public void onBindViewHolder_setAllButtonWithoutButton3_shouldHideDivider2() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton2Text(R.string.install_other_apps);
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -302,8 +304,8 @@
@Test
public void onBindViewHolder_setButton1And4_shouldShowDivider3Only() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -317,7 +319,7 @@
@Test
public void onBindViewHolder_setOneButtonOnly_noDivider() {
- mPref.setButton4Text(R.string.install_other_apps);
+ mPref.setButton4Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -331,8 +333,8 @@
@Test
public void onBindViewHolder_setButton1And2_shouldShowDivider1Only() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton2Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton2Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
@@ -346,8 +348,8 @@
@Test
public void onBindViewHolder_setButton1And3_shouldShowDivider2Only() {
- mPref.setButton1Text(R.string.install_other_apps);
- mPref.setButton3Text(R.string.install_other_apps);
+ mPref.setButton1Text(com.android.settingslib.R.string.install_other_apps);
+ mPref.setButton3Text(com.android.settingslib.R.string.install_other_apps);
mPref.onBindViewHolder(mHolder);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java
index 10862403..6195d75 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java
@@ -36,7 +36,7 @@
import android.graphics.drawable.ShapeDrawable;
import android.os.Bundle;
-import com.android.settingslib.R;
+import com.android.settingslib.widget.adaptiveicon.R;
import com.android.settingslib.drawer.ActivityTile;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.Tile;
@@ -87,7 +87,7 @@
public void setBackgroundColor_externalTileWithBackgroundColorRawValue_shouldUpdateIcon() {
final Tile tile = spy(new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB, 0xff0000);
- doReturn(Icon.createWithResource(mContext, R.drawable.ic_system_update))
+ doReturn(Icon.createWithResource(mContext, com.android.settingslib.R.drawable.ic_system_update))
.when(tile).getIcon(mContext);
final AdaptiveIcon icon =
new AdaptiveIcon(mContext, new ColorDrawable(Color.BLACK));
@@ -99,7 +99,7 @@
@Test
public void setBackgroundColor_tileWithoutBackgroundColor_shouldSetDefaultBackgroundColor() {
final Tile tile = spy(new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- doReturn(Icon.createWithResource(mContext, R.drawable.ic_system_update))
+ doReturn(Icon.createWithResource(mContext, com.android.settingslib.R.drawable.ic_system_update))
.when(tile).getIcon(mContext);
final AdaptiveIcon icon = new AdaptiveIcon(mContext, new ColorDrawable(Color.BLACK));
@@ -114,7 +114,7 @@
final Tile tile = spy(new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON_BACKGROUND_HINT,
com.android.settingslib.widget.R.color.bt_outline_color);
- doReturn(Icon.createWithResource(mContext, R.drawable.ic_system_update))
+ doReturn(Icon.createWithResource(mContext, com.android.settingslib.R.drawable.ic_system_update))
.when(tile).getIcon(mContext);
final AdaptiveIcon icon =
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveOutlineDrawableTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveOutlineDrawableTest.java
index b2bc53d..943b994 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveOutlineDrawableTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveOutlineDrawableTest.java
@@ -21,6 +21,8 @@
import android.content.res.Resources;
import android.graphics.Paint;
+import com.android.settingslib.widget.adaptiveicon.R;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppEntitiesHeaderControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppEntitiesHeaderControllerTest.java
index c9b066a..172c178 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppEntitiesHeaderControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppEntitiesHeaderControllerTest.java
@@ -24,6 +24,8 @@
import android.widget.ImageView;
import android.widget.TextView;
+import com.android.settingslib.widget.entityheader.R;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -69,18 +71,18 @@
@Test
public void setHeaderTitleRes_setTextRes_shouldSetToTitleView() {
- mController.setHeaderTitleRes(R.string.expand_button_title).apply();
+ mController.setHeaderTitleRes(androidx.preference.R.string.expand_button_title).apply();
final TextView view = mAppEntitiesHeaderView.findViewById(R.id.header_title);
- assertThat(view.getText()).isEqualTo(mContext.getText(R.string.expand_button_title));
+ assertThat(view.getText()).isEqualTo(mContext.getText(androidx.preference.R.string.expand_button_title));
}
@Test
public void setHeaderDetailsRes_setTextRes_shouldSetToDetailsView() {
- mController.setHeaderDetailsRes(R.string.expand_button_title).apply();
+ mController.setHeaderDetailsRes(androidx.preference.R.string.expand_button_title).apply();
final TextView view = mAppEntitiesHeaderView.findViewById(R.id.header_details);
- assertThat(view.getText()).isEqualTo(mContext.getText(R.string.expand_button_title));
+ assertThat(view.getText()).isEqualTo(mContext.getText(androidx.preference.R.string.expand_button_title));
}
@Test
@@ -93,7 +95,7 @@
@Test
public void setHeaderDetails_detailsTextAndResBothSet_shouldSetTextToDetailsView() {
- mController.setHeaderDetailsRes(R.string.expand_button_title);
+ mController.setHeaderDetailsRes(androidx.preference.R.string.expand_button_title);
mController.setHeaderDetails(TITLE).apply();
final TextView view = mAppEntitiesHeaderView.findViewById(R.id.header_details);
@@ -206,7 +208,7 @@
@Test
public void apply_noAppEntitySet_shouldOnlyShowTitleAndEmptyView() {
- mController.setHeaderTitleRes(R.string.expand_button_title)
+ mController.setHeaderTitleRes(androidx.preference.R.string.expand_button_title)
.setAppEntity(0, mAppEntityInfo)
.setAppEntity(1, mAppEntityInfo)
.setAppEntity(2, mAppEntityInfo).apply();
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppHeaderPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppHeaderPreferenceTest.java
index e2b242c..9112f6b 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppHeaderPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppHeaderPreferenceTest.java
@@ -24,7 +24,7 @@
import androidx.preference.PreferenceViewHolder;
-
+import com.android.settingslib.widget.preference.app.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppPreferenceTest.java
index 9e265a4..6c8fd50 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AppPreferenceTest.java
@@ -23,6 +23,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.app.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,7 +58,7 @@
@Test
public void foobar_testName() {
- float iconSize = mContext.getResources().getDimension(R.dimen.secondary_app_icon_size);
+ float iconSize = mContext.getResources().getDimension(com.android.settingslib.widget.theme.R.dimen.secondary_app_icon_size);
assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32));
}
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BannerMessagePreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BannerMessagePreferenceTest.java
index 0d88913..721e69d 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BannerMessagePreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BannerMessagePreferenceTest.java
@@ -39,7 +39,7 @@
import androidx.annotation.ColorRes;
import androidx.preference.PreferenceViewHolder;
-import androidx.preference.R;
+import com.android.settingslib.widget.preference.banner.R;
import com.android.settingslib.testutils.OverpoweredReflectionHelper;
@@ -65,7 +65,7 @@
private final View.OnClickListener mClickListener = v -> mClickListenerCalled = true;
private final int mMinimumTargetSize =
RuntimeEnvironment.application.getResources()
- .getDimensionPixelSize(R.dimen.settingslib_preferred_minimum_touch_target);
+ .getDimensionPixelSize(com.android.settingslib.widget.theme.R.dimen.settingslib_preferred_minimum_touch_target);
private static final int TEST_STRING_RES_ID =
R.string.accessibility_banner_message_dismiss;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java
index 567d90f..ae6573e 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BarChartPreferenceTest.java
@@ -26,6 +26,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.barchart.R;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -71,9 +73,9 @@
mDetailsView = mBarChartView.findViewById(R.id.bar_chart_details);
mBarChartInfo = new BarChartInfo.Builder()
- .setTitle(R.string.debug_app)
- .setDetails(R.string.debug_app)
- .setEmptyText(R.string.debug_app)
+ .setTitle(com.android.settingslib.R.string.debug_app)
+ .setDetails(com.android.settingslib.R.string.debug_app)
+ .setEmptyText(com.android.settingslib.R.string.debug_app)
.setDetailsOnClickListener(v -> {
})
.build();
@@ -82,21 +84,21 @@
@Test
public void initializeBarChart_titleSet_shouldSetTitleInChartView() {
final BarChartInfo barChartInfo = new BarChartInfo.Builder()
- .setTitle(R.string.debug_app)
+ .setTitle(com.android.settingslib.R.string.debug_app)
.build();
mPreference.initializeBarChart(barChartInfo);
mPreference.onBindViewHolder(mHolder);
assertThat(mTitleView.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(mTitleView.getText()).isEqualTo(mContext.getText(R.string.debug_app));
+ assertThat(mTitleView.getText()).isEqualTo(mContext.getText(com.android.settingslib.R.string.debug_app));
}
@Test
public void initializeBarChart_noBarViewSet_shouldShowTitleAndEmptyView() {
final BarChartInfo barChartInfo = new BarChartInfo.Builder()
- .setTitle(R.string.debug_app)
- .setEmptyText(R.string.debug_app)
+ .setTitle(com.android.settingslib.R.string.debug_app)
+ .setEmptyText(com.android.settingslib.R.string.debug_app)
.build();
mPreference.initializeBarChart(barChartInfo);
@@ -113,11 +115,11 @@
@Test
public void initializeBarChart_detailsSet_shouldShowBarChartDetailsView() {
final BarChartInfo barChartInfo = new BarChartInfo.Builder()
- .setTitle(R.string.debug_app)
- .setDetails(R.string.debug_app)
+ .setTitle(com.android.settingslib.R.string.debug_app)
+ .setDetails(com.android.settingslib.R.string.debug_app)
.addBarViewInfo(
new BarViewInfo(mIcon, 10, null /* title */,
- mContext.getText(R.string.debug_app) /* summary */,
+ mContext.getText(com.android.settingslib.R.string.debug_app) /* summary */,
null /* contentDescription */))
.build();
@@ -125,17 +127,17 @@
mPreference.onBindViewHolder(mHolder);
assertThat(mDetailsView.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(mDetailsView.getText()).isEqualTo(mContext.getText(R.string.debug_app));
+ assertThat(mDetailsView.getText()).isEqualTo(mContext.getText(com.android.settingslib.R.string.debug_app));
}
@Test
public void initializeBarChart_detailsNotSet_shouldHideBarChartDetailsView() {
// We don't call BarChartInfo.Builder#setDetails yet.
final BarChartInfo barChartInfo = new BarChartInfo.Builder()
- .setTitle(R.string.debug_app)
+ .setTitle(com.android.settingslib.R.string.debug_app)
.addBarViewInfo(
new BarViewInfo(mIcon, 10, null /* title */,
- mContext.getText(R.string.debug_app) /* summary */,
+ mContext.getText(com.android.settingslib.R.string.debug_app) /* summary */,
null /* contentDescription */))
.build();
@@ -148,13 +150,13 @@
@Test
public void initializeBarChart_clickListenerSet_shouldSetClickListenerOnDetailsView() {
final BarChartInfo barChartInfo = new BarChartInfo.Builder()
- .setTitle(R.string.debug_app)
- .setDetails(R.string.debug_app)
+ .setTitle(com.android.settingslib.R.string.debug_app)
+ .setDetails(com.android.settingslib.R.string.debug_app)
.setDetailsOnClickListener(v -> {
})
.addBarViewInfo(
new BarViewInfo(mIcon, 10, null /* title */,
- mContext.getText(R.string.debug_app) /* summary */,
+ mContext.getText(com.android.settingslib.R.string.debug_app) /* summary */,
null /* contentDescription */))
.build();
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java
index d78f8e7..f3fe517 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java
@@ -68,14 +68,14 @@
@Test
public void onBindViewHolder_whenIconSet_shouldSetIcon() {
- mPreference.setIcon(R.drawable.settingslib_ic_cross);
+ mPreference.setIcon(com.android.settingslib.widget.preference.banner.R.drawable.settingslib_ic_cross);
mPreference.onBindViewHolder(mHolder);
final Button button = mPreference.getButton();
final Drawable icon = button.getCompoundDrawablesRelative()[0];
final ShadowDrawable shadowDrawable = shadowOf(icon);
- assertThat(shadowDrawable.getCreatedFromResId()).isEqualTo(R.drawable.settingslib_ic_cross);
+ assertThat(shadowDrawable.getCreatedFromResId()).isEqualTo(com.android.settingslib.widget.preference.banner.R.drawable.settingslib_ic_cross);
}
@Test
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java
index a26f200..ccbe4f0 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java
@@ -28,7 +28,7 @@
import androidx.preference.PreferenceViewHolder;
-import com.android.settingslib.R;
+import com.android.settingslib.widget.preference.footer.R;
import org.junit.Before;
import org.junit.Test;
@@ -96,7 +96,7 @@
public void onBindViewHolder_whenTitleIsNull_shouldNotRaiseNpe() {
PreferenceViewHolder viewHolder = spy(PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext)
- .inflate(com.android.settingslib.widget.R.layout.preference_footer, null)));
+ .inflate(R.layout.preference_footer, null)));
when(viewHolder.findViewById(androidx.core.R.id.title)).thenReturn(null);
Throwable actualThrowable = null;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java
index 21e119a..6590bbd 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java
@@ -39,6 +39,8 @@
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settingslib.widget.preference.illustration.R;
+
import com.airbnb.lottie.LottieAnimationView;
import org.junit.Before;
@@ -49,6 +51,7 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+
@RunWith(RobolectricTestRunner.class)
public class IllustrationPreferenceTest {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/LayoutPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/LayoutPreferenceTest.java
index 99261a3..58817fb 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/LayoutPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/LayoutPreferenceTest.java
@@ -27,6 +27,8 @@
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.layout.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java
index 24037ca..942e915 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java
@@ -26,6 +26,8 @@
import android.widget.Switch;
import android.widget.TextView;
+import com.android.settingslib.widget.mainswitch.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchPreferenceTest.java
index e58c04a..c2e81bd 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchPreferenceTest.java
@@ -24,6 +24,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.mainswitch.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/RadioButtonPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/RadioButtonPreferenceTest.java
index a5028ff..0f708cd 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/RadioButtonPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/RadioButtonPreferenceTest.java
@@ -28,6 +28,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.radio.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/SelectorWithWidgetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/SelectorWithWidgetPreferenceTest.java
index 34efe82..60885f1 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/SelectorWithWidgetPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/SelectorWithWidgetPreferenceTest.java
@@ -28,6 +28,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.selector.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java
index 23b4c2a..3befdda 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java
@@ -32,6 +32,8 @@
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.preference.twotarget.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/packages/SettingsLib/tests/unit/Android.bp b/packages/SettingsLib/tests/unit/Android.bp
index a4558f1..19ab1c6 100644
--- a/packages/SettingsLib/tests/unit/Android.bp
+++ b/packages/SettingsLib/tests/unit/Android.bp
@@ -20,6 +20,7 @@
android_test {
name: "SettingsLibUnitTests",
+ use_resource_processor: true,
test_suites: ["device-tests"],
srcs: [