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

Enable use_resource_processor for all sysui deps

Browse Source 
This will make the build faster

Test: m checkbuild
Bug: 295208392
Change-Id: If75acb6b1c3f204e3686c20cef609f7cfabe15cf
This commit is contained in:
Peter Kalauskas
2023-08-23 17:41:28 -07:00
parent 08710ee575
commit 80e914a263
49 changed files with 101 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
View File

@@ -45,15 +45,15 @@ public class AppCheckBoxPreferenceTest {
mAttrPreference = new AppCheckBoxPreference(mContext, null /* attrs */);
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext)
.inflate(com.android.settingslib.widget.R.layout.preference_app, null));
.inflate(com.android.settingslib.widget.preference.app.R.layout.preference_app, null));
}
@Test
public void testGetLayoutResource() {
assertThat(mPreference.getLayoutResource())
.isEqualTo(com.android.settingslib.widget.R.layout.preference_app);
.isEqualTo(com.android.settingslib.widget.preference.app.R.layout.preference_app);
assertThat(mAttrPreference.getLayoutResource())
.isEqualTo(com.android.settingslib.widget.R.layout.preference_app);
.isEqualTo(com.android.settingslib.widget.preference.app.R.layout.preference_app);
}
@Test
@@ -61,7 +61,7 @@ public class AppCheckBoxPreferenceTest {
mPreference.onBindViewHolder(mPreferenceViewHolder);
View appendix =
mPreferenceViewHolder.findViewById(com.android.settingslib.widget.R.id.appendix);
mPreferenceViewHolder.findViewById(com.android.settingslib.widget.preference.app.R.id.appendix);
assertThat(appendix.getVisibility()).isEqualTo(View.GONE);
}
}

32
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -100,7 +100,7 @@ public class EntityHeaderControllerTest {
@Test
public void testBuildView_constructedWithView_shouldReturnSameView() {
View inputView = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
View view = mController.done();
@@ -111,11 +111,11 @@ public class EntityHeaderControllerTest {
public void bindViews_shouldBindAllData() {
final String testString = "test";
final View header = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
final TextView label = header.findViewById(R.id.entity_header_title);
final TextView summary = header.findViewById(R.id.entity_header_summary);
final TextView secondSummary = header.findViewById(
com.android.settingslib.widget.R.id.entity_header_second_summary);
com.android.settingslib.widget.preference.layout.R.id.entity_header_second_summary);
mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
mController.setLabel(testString);
@@ -139,7 +139,7 @@ public class EntityHeaderControllerTest {
info.activityInfo.packageName = "123";
info.activityInfo.name = "321";
final View view = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
@@ -163,7 +163,7 @@ public class EntityHeaderControllerTest {
info.activityInfo.packageName = "123";
info.activityInfo.name = "321";
final View view = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
@@ -180,7 +180,7 @@ public class EntityHeaderControllerTest {
@Test
public void bindButton_noAppInfo_shouldNotAttachClickListener() {
final View appLinks = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
final FragmentActivity activity = mock(FragmentActivity.class);
when(mFragment.getActivity()).thenReturn(activity);
@@ -197,7 +197,7 @@ public class EntityHeaderControllerTest {
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
.isEqualTo(View.GONE);
appLinks.findViewById(com.android.settingslib.widget.R.id.entity_header_content)
appLinks.findViewById(com.android.settingslib.widget.preference.layout.R.id.entity_header_content)
.performClick();
verify(mFragment, never()).getActivity();
verify(activity, never()).startActivity(any(Intent.class));
@@ -206,7 +206,7 @@ public class EntityHeaderControllerTest {
@Test
public void bindButton_hasAppInfo_shouldAttachClickListener() {
final View appLinks = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
final FragmentActivity activity = mock(FragmentActivity.class);
when(mFragment.getActivity()).thenReturn(activity);
when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
@@ -220,7 +220,7 @@ public class EntityHeaderControllerTest {
EntityHeaderController.ActionType.ACTION_NONE);
mController.done();
appLinks.findViewById(com.android.settingslib.widget.R.id.entity_header_content)
appLinks.findViewById(com.android.settingslib.widget.preference.layout.R.id.entity_header_content)
.performClick();
verify(activity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
@@ -229,7 +229,7 @@ public class EntityHeaderControllerTest {
@Test
public void iconContentDescription_shouldWorkWithSetIcon() {
final View view = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";
@@ -243,7 +243,7 @@ public class EntityHeaderControllerTest {
@Test
public void iconContentDescription_shouldWorkWithoutSetIcon() {
final View view = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";
@@ -256,7 +256,7 @@ public class EntityHeaderControllerTest {
@Test
public void bindButton_hasAppNotifIntent_shouldShowButton() {
final View appLinks = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setAppNotifPrefIntent(new Intent())
@@ -276,11 +276,11 @@ public class EntityHeaderControllerTest {
@Test
public void instantApps_normalAppsDontGetLabel() {
final View header = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
mController.done();
View installType = header.findViewById(com.android.settingslib.widget.R.id.install_type);
View installType = header.findViewById(com.android.settingslib.widget.preference.layout.R.id.install_type);
assertThat(installType.getVisibility()).isEqualTo(View.GONE);
}
@@ -288,11 +288,11 @@ public class EntityHeaderControllerTest {
@Test
public void instantApps_expectedHeaderItem() {
final View header = mLayoutInflater.inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null /* root */);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
mController.setIsInstantApp(true);
mController.done();
TextView label = header.findViewById(com.android.settingslib.widget.R.id.install_type);
TextView label = header.findViewById(com.android.settingslib.widget.preference.layout.R.id.install_type);
assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(label.getText()).isEqualTo(

6
tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
View File

@@ -126,7 +126,7 @@ public class PrimaryCheckBoxPreferenceTest {
final LayoutInflater inflater = LayoutInflater.from(mContext);
final PreferenceViewHolder holder = 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));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
assertThat(widgetView).isNotNull();
@@ -146,7 +146,7 @@ public class PrimaryCheckBoxPreferenceTest {
final LayoutInflater inflater = LayoutInflater.from(mContext);
final PreferenceViewHolder holder = 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));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
assertThat(widgetView).isNotNull();
@@ -163,7 +163,7 @@ public class PrimaryCheckBoxPreferenceTest {
public void clickWidgetView_shouldNotifyPreferenceChanged() {
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(
com.android.settingslib.widget.R.layout.preference_two_target, null));
com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target, null));
final View widgetView = holder.findViewById(android.R.id.widget_frame);
final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
mPreference.setOnPreferenceChangeListener(listener);

4
tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java
View File

@@ -53,7 +53,7 @@ public class SettingsMainSwitchPreferenceTest {
mPreference = new SettingsMainSwitchPreference(context);
ReflectionHelpers.setField(mPreference, "mEnforcedAdmin", mEnforcedAdmin);
ReflectionHelpers.setField(mPreference, "mMainSwitchBar", switchBar);
final View rootView = View.inflate(context, R.layout.preference_widget_main_switch,
final View rootView = View.inflate(context, com.android.settings.R.layout.preference_widget_main_switch,
null /* parent */);
mHolder = PreferenceViewHolder.createInstanceForTests(rootView);
}
@@ -64,7 +64,7 @@ public class SettingsMainSwitchPreferenceTest {
final SettingsMainSwitchBar switchBar = mPreference.getSwitchBar();
final ImageView restrictedIcon = switchBar.findViewById(
com.android.settingslib.widget.R.id.restricted_icon);
com.android.settingslib.widget.restricted.R.id.restricted_icon);
assertThat(restrictedIcon.getVisibility() == View.VISIBLE).isTrue();
}