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

Merge "Enable use_resource_processor for all sysui deps" into main

Browse Source
This commit is contained in:
Peter Kalauskas
2023-09-22 18:41:27 +00:00
committed by Android (Google) Code Review
parent af77327017 80e914a263
commit 1bb84f9854
49 changed files with 101 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public class AccessibilityFooterPreferenceControllerTest {
final LayoutInflater inflater = LayoutInflater.from(mContext);
final View view = inflater.inflate(
com.android.settingslib.widget.R.layout.preference_footer, null);
com.android.settingslib.widget.preference.footer.R.layout.preference_footer, null);
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view);
mPreference.onBindViewHolder(mPreferenceViewHolder);
@@ -117,7 +117,7 @@ public class AccessibilityFooterPreferenceControllerTest {
mPreference.onBindViewHolder(mPreferenceViewHolder);
final TextView learnMoreView = (TextView) mPreferenceViewHolder
.findViewById(com.android.settingslib.widget.R.id.settingslib_learn_more);
.findViewById(com.android.settingslib.widget.preference.footer.R.id.settingslib_learn_more);
assertThat(learnMoreView.getContentDescription()).isNull();
assertThat(learnMoreView.getVisibility()).isEqualTo(View.GONE);
assertThat(mPreference.isLinkEnabled()).isFalse();

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

@@ -46,7 +46,7 @@ public final class AccessibilityFooterPreferenceTest {
final LayoutInflater inflater = LayoutInflater.from(context);
final View view =
inflater.inflate(com.android.settingslib.widget.R.layout.preference_footer, null);
inflater.inflate(com.android.settingslib.widget.preference.footer.R.layout.preference_footer, null);
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view);
}

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

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

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

@@ -69,7 +69,7 @@ public class FlashNotificationsPreviewPreferenceTest {
final View frame = mPreferenceViewHolder.findViewById(R.id.frame);
final int backgroundResId = Shadows.shadowOf(frame.getBackground()).getCreatedFromResId();
assertThat(backgroundResId).isEqualTo(
com.android.settingslib.widget.R.drawable.settingslib_switch_bar_bg_on);
com.android.settingslib.widget.mainswitch.R.drawable.settingslib_switch_bar_bg_on);
final TextView title = (TextView) mPreferenceViewHolder.findViewById(android.R.id.title);
assertThat(title.getAlpha()).isEqualTo(1f);
assertThat(title.getCurrentTextColor()).isEqualTo(textColorEnabled);

2
tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
View File

@@ -73,7 +73,7 @@ public class AccountHeaderPreferenceControllerTest {
FakeFeatureFactory.setupForTest();
mHeaderPreference = new LayoutPreference(
RuntimeEnvironment.application,
com.android.settingslib.widget.R.layout.settings_entity_header);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header);
doReturn(RuntimeEnvironment.application).when(mActivity).getApplicationContext();
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);

2
tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
View File

@@ -80,7 +80,7 @@ public class AppHeaderViewPreferenceControllerTest {
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mHeader = LayoutInflater.from(mContext).inflate(
com.android.settingslib.widget.R.layout.settings_entity_header, null);
com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header, null);
when(mFragment.getActivity()).thenReturn(mActivity);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);

2
tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
View File

@@ -72,7 +72,7 @@ public class DomainAppPreferenceControllerTest {
final DomainAppPreference pref = new DomainAppPreference(mContext, mAppEntry);
assertThat(pref.getLayoutResource())
.isEqualTo(com.android.settingslib.widget.R.layout.preference_app);
.isEqualTo(com.android.settingslib.widget.preference.app.R.layout.preference_app);
}
private ApplicationInfo createApplicationInfo(String packageName) {

6
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
View File

@@ -55,10 +55,10 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr
super.setUp();
final View buttons = View.inflate(
RuntimeEnvironment.application,
com.android.settingslib.widget.R.layout.settingslib_action_buttons,
com.android.settingslib.widget.preference.actionbuttons.R.layout.settingslib_action_buttons,
null /* parent */);
mConnectButton = buttons.findViewById(com.android.settingslib.widget.R.id.button2);
mForgetButton = buttons.findViewById(com.android.settingslib.widget.R.id.button1);
mConnectButton = buttons.findViewById(com.android.settingslib.widget.preference.actionbuttons.R.id.button2);
mForgetButton = buttons.findViewById(com.android.settingslib.widget.preference.actionbuttons.R.id.button1);
mController =
new BluetoothDetailsButtonsController(mContext, mFragment, mCachedDevice,
mLifecycle);

2
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
View File

@@ -72,7 +72,7 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro
mController =
new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice, mLifecycle);
mPreference = new LayoutPreference(
mContext, com.android.settingslib.widget.R.layout.settings_entity_header);
mContext, com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header);
mPreference.setKey(mController.getPreferenceKey());
mScreen.addPreference(mPreference);
setupDevice(mDeviceConfig);

2
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
View File

@@ -94,7 +94,7 @@ public class UsbDetailsHeaderControllerTest {
ShadowEntityHeaderController.setUseMock(mHeaderController);
mDetailsHeaderController = new UsbDetailsHeaderController(mContext, mFragment, mUsbBackend);
mPreference = new LayoutPreference(
mContext, com.android.settingslib.widget.R.layout.settings_entity_header);
mContext, com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header);
mPreference.setKey(mDetailsHeaderController.getPreferenceKey());
mScreen.addPreference(mPreference);
}

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,
50 /* percent */, mUidDetailProvider);
final View view = LayoutInflater.from(RuntimeEnvironment.application).inflate(
com.android.settingslib.widget.R.layout.preference_app, null);
com.android.settingslib.widget.preference.app.R.layout.preference_app, null);
final PreferenceViewHolder preferenceViewHolder =
PreferenceViewHolder.createInstanceForTests(view);
final ProgressBar progressBar = (ProgressBar) preferenceViewHolder.findViewById(

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

@@ -141,7 +141,7 @@ public class UnrestrictedDataAccessPreferenceControllerTest {
assertThat(preference.isDisabledByAdmin()).isTrue();
assertThat(preference.getSummary()).isEqualTo(
mContext.getString(
com.android.settingslib.widget.R.string.disabled_by_admin));
com.android.settingslib.widget.restricted.R.string.disabled_by_admin));
}
assertThat(preference.isChecked()).isFalse();
preference.performClick();

4
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreferenceTest.java
View File

@@ -54,7 +54,7 @@ public class PowerGaugePreferenceTest {
mContext = RuntimeEnvironment.application;
mRootView = 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);
mWidgetView =
LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary, null);
final LinearLayout widgetFrame = mRootView.findViewById(android.R.id.widget_frame);
@@ -64,7 +64,7 @@ public class PowerGaugePreferenceTest {
mPowerGaugePreference = new PowerGaugePreference(mContext);
assertThat(mPowerGaugePreference.getLayoutResource())
.isEqualTo(com.android.settingslib.widget.R.layout.preference_app);
.isEqualTo(com.android.settingslib.widget.preference.app.R.layout.preference_app);
}
@Test

4
tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
View File

@@ -80,7 +80,7 @@ public class RecentLocationAccessPreferenceControllerTest {
mController.init(mDashboardFragment);
final String key = mController.getPreferenceKey();
mAppEntitiesHeaderView = LayoutInflater.from(mContext).inflate(
com.android.settingslib.widget.R.layout.app_entities_header, null /* root */);
com.android.settingslib.widget.entityheader.R.layout.app_entities_header, null /* root */);
when(mScreen.findPreference(key)).thenReturn(mLayoutPreference);
when(mLayoutPreference.getKey()).thenReturn(key);
when(mLayoutPreference.getContext()).thenReturn(mContext);
@@ -109,7 +109,7 @@ public class RecentLocationAccessPreferenceControllerTest {
assertThat(title.getText()).isEqualTo(
mContext.getText(R.string.location_category_recent_location_access));
final TextView details = mAppEntitiesHeaderView
.findViewById(com.android.settingslib.widget.R.id.header_details);
.findViewById(com.android.settingslib.widget.entityheader.R.id.header_details);
assertThat(details.getText()).isEqualTo(
mContext.getText(R.string.location_recent_location_access_view_details));
assertThat(details.hasOnClickListeners()).isTrue();

4
tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
View File

@@ -74,7 +74,7 @@ public class SearchMenuControllerTest {
when(mHost.getActivity()).thenReturn(mActivity);
when(mMenu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
com.android.settingslib.search.R.string.search_menu))
com.android.settingslib.search.widget.R.string.search_menu))
.thenReturn(mock(MenuItem.class));
}
@@ -84,7 +84,7 @@ public class SearchMenuControllerTest {
mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
verify(mMenu).add(Menu.NONE, MENU_SEARCH, 0 /* order */,
com.android.settingslib.search.R.string.search_menu);
com.android.settingslib.search.widget.R.string.search_menu);
}
@Test

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();
}