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

2
src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java
View File

@@ -63,7 +63,7 @@ public class FlashNotificationsPreviewPreference extends Preference {
private void init() {
setLayoutResource(R.layout.flash_notification_preview_preference);
mBackgroundEnabled = getContext().getDrawable(
com.android.settingslib.widget.R.drawable.settingslib_switch_bar_bg_on);
com.android.settingslib.widget.mainswitch.R.drawable.settingslib_switch_bar_bg_on);
mBackgroundDisabled = getContext().getDrawable(R.drawable.switch_bar_bg_disabled);
mTextColorDisabled = Utils.getColorAttrDefaultColor(getContext(),
android.R.attr.textColorPrimary);

2
src/com/android/settings/accessibility/VibrationSettings.java
View File

@@ -81,7 +81,7 @@ public class VibrationSettings extends DashboardFragment {
R.integer.config_vibration_supported_intensity_levels);
if (rv != null && supportedIntensities > 1) {
final int bottom_padding = res.getDimensionPixelSize(
com.android.settingslib.widget.R.dimen.settingslib_listPreferredItemPaddingEnd);
com.android.settingslib.widget.theme.R.dimen.settingslib_listPreferredItemPaddingEnd);
rv.setPaddingRelative(rv.getPaddingStart(), rv.getPaddingTop(), rv.getPaddingEnd(),
rv.getPaddingBottom() + bottom_padding);
}

2
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -93,7 +93,7 @@ public class AccountTypePreferenceLoader {
desc.packageName, 0, mUserHandle);
final Theme baseTheme = mFragment.getResources().newTheme();
baseTheme.applyStyle(
com.android.settingslib.widget.R.style.Theme_SettingsBase, true);
com.android.settingslib.widget.theme.R.style.Theme_SettingsBase, true);
final Context themedCtx =
new LocalClassLoaderContextThemeWrapper(getClass(), targetCtx, 0);
themedCtx.getTheme().setTo(baseTheme);

3
src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
View File

@@ -127,7 +127,8 @@ public class RadioWithImagePreference extends CheckBoxPreference {
}
private void init() {
setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
setWidgetLayoutResource(
com.android.settingslib.widget.preference.radio.R.layout.preference_widget_radiobutton);
setLayoutResource(R.layout.radio_with_image_preference);
setIconSpaceReserved(false);
}

2
src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
View File

@@ -88,7 +88,7 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
userHandle);
if ((userRestrictionSource & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) {
return context.getString(com.android.settingslib.widget.R.string.disabled_by_admin);
return context.getString(com.android.settingslib.widget.restricted.R.string.disabled_by_admin);
} else if (userRestrictionSource != 0) {
return context.getString(com.android.settingslib.R.string.disabled);
}

8
src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
View File

@@ -73,7 +73,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
mAppName = itemView.findViewById(android.R.id.title);
mAppIcon = itemView.findViewById(android.R.id.icon);
mSummary = itemView.findViewById(android.R.id.summary);
mDisabled = itemView.findViewById(com.android.settingslib.widget.R.id.appendix);
mDisabled = itemView.findViewById(com.android.settingslib.widget.preference.app.R.id.appendix);
mSwitch = itemView.findViewById(R.id.switchWidget);
mWidgetContainer = itemView.findViewById(android.R.id.widget_frame);
mAddIcon = itemView.findViewById(R.id.add_preference_widget);
@@ -86,7 +86,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
static View newView(ViewGroup parent, boolean twoTarget, int listType) {
ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
.inflate(com.android.settingslib.widget.R.layout.preference_app, parent, false);
.inflate(com.android.settingslib.widget.preference.app.R.layout.preference_app, parent, false);
ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
if (twoTarget) {
if (widgetFrame != null) {
@@ -98,7 +98,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
.inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
}
View divider = LayoutInflater.from(parent.getContext()).inflate(
com.android.settingslib.widget.R.layout.preference_two_target_divider,
com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target_divider,
view, false);
// second to last, before widget frame
view.addView(divider, view.getChildCount() - 1);
@@ -111,7 +111,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
static View newHeader(ViewGroup parent, int resText) {
ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
.inflate(com.android.settingslib.widget.R.layout.preference_app_header,
.inflate(com.android.settingslib.widget.preference.app.R.layout.preference_app_header,
parent, false);
TextView textView = view.findViewById(R.id.apps_top_intro_text);
textView.setText(resText);

12
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -209,7 +209,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
}
final ImageView personalIconView = mHeader.findViewById(
com.android.settingslib.widget.R.id.entity_header_icon_personal);
com.android.settingslib.widget.preference.layout.R.id.entity_header_icon_personal);
if (personalIconView != null) {
Drawable icon = IconDrawableFactory.newInstance(mContext)
.getBadgedIcon(mPackageInfo.applicationInfo, personalProfile.getIdentifier())
@@ -221,7 +221,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
}
final ImageView workIconView = mHeader.findViewById(
com.android.settingslib.widget.R.id.entity_header_icon_work);
com.android.settingslib.widget.preference.layout.R.id.entity_header_icon_work);
if (workIconView != null) {
Drawable icon = IconDrawableFactory.newInstance(mContext)
.getBadgedIcon(mPackageInfo.applicationInfo, workProfile.getIdentifier())
@@ -502,11 +502,11 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
mSwitchPref.setChecked(true);
mSwitchPref.setTitle(R.string.interact_across_profiles_switch_enabled);
final ImageView horizontalArrowIcon =
mHeader.findViewById(com.android.settingslib.widget.R.id.entity_header_swap_horiz);
mHeader.findViewById(com.android.settingslib.widget.preference.layout.R.id.entity_header_swap_horiz);
if (horizontalArrowIcon != null) {
horizontalArrowIcon.setImageDrawable(
mContext.getDrawable(
com.android.settingslib.widget.R.drawable.ic_swap_horiz_blue));
com.android.settingslib.widget.preference.layout.R.drawable.ic_swap_horiz_blue));
}
}
@@ -514,11 +514,11 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
mSwitchPref.setChecked(false);
mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);
final ImageView horizontalArrowIcon =
mHeader.findViewById(com.android.settingslib.widget.R.id.entity_header_swap_horiz);
mHeader.findViewById(com.android.settingslib.widget.preference.layout.R.id.entity_header_swap_horiz);
if (horizontalArrowIcon != null) {
horizontalArrowIcon.setImageDrawable(
mContext.getDrawable(
com.android.settingslib.widget.R.drawable.ic_swap_horiz_grey));
com.android.settingslib.widget.preference.layout.R.drawable.ic_swap_horiz_grey));
}
}

2
src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java
View File

@@ -113,7 +113,7 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
});
mAlertDialog = new AlertDialog.Builder(mContext,
com.android.settingslib.widget.R.style.Theme_AlertDialog_SettingsLib)
com.android.settingslib.widget.theme.R.style.Theme_AlertDialog_SettingsLib)
.setView(layout)
.create();

2
src/com/android/settings/bluetooth/BluetoothBroadcastSourcePreference.java
View File

@@ -60,7 +60,7 @@ class BluetoothBroadcastSourcePreference extends Preference {
@Override
public void onBindViewHolder(final PreferenceViewHolder view) {
super.onBindViewHolder(view);
view.findViewById(com.android.settingslib.widget.R.id.two_target_divider)
view.findViewById(com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider)
.setVisibility(View.INVISIBLE);
final ImageButton imageButton =
(ImageButton) view.findViewById(com.android.settingslib.R.id.icon_button);

4
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -111,9 +111,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
if (isToolbarEnabled() && !isAnySetupWizard) {
super.setContentView(
com.android.settingslib.widget.R.layout.collapsing_toolbar_base_layout);
com.android.settingslib.collapsingtoolbar.R.layout.collapsing_toolbar_base_layout);
mCollapsingToolbarLayout =
findViewById(com.android.settingslib.widget.R.id.collapsing_toolbar);
findViewById(com.android.settingslib.collapsingtoolbar.R.id.collapsing_toolbar);
mAppBarLayout = findViewById(R.id.app_bar);
if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);

2
src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
View File

@@ -176,7 +176,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
if (mDataUsageState != null) {
setChecked(mDataUsageState.isDataSaverAllowlisted);
if (isDisabledByAdmin()) {
setSummary(com.android.settingslib.widget.R.string.disabled_by_admin);
setSummary(com.android.settingslib.widget.restricted.R.string.disabled_by_admin);
} else if (mDataUsageState.isDataSaverDenylisted) {
setSummary(R.string.restrict_background_blocklisted);
} else {

4
src/com/android/settings/development/AppViewHolder.java
View File

@@ -36,7 +36,7 @@ public class AppViewHolder {
static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
if (convertView == null) {
convertView =
inflater.inflate(com.android.settingslib.widget.R.layout.preference_app, null);
inflater.inflate(com.android.settingslib.widget.preference.app.R.layout.preference_app, null);
// Creates a ViewHolder and store references to the two children views
// we want to bind data to.
@@ -46,7 +46,7 @@ public class AppViewHolder {
holder.appIcon = convertView.findViewById(android.R.id.icon);
holder.summary = convertView.findViewById(android.R.id.summary);
holder.disabled =
convertView.findViewById(com.android.settingslib.widget.R.id.appendix);
convertView.findViewById(com.android.settingslib.widget.preference.app.R.id.appendix);
holder.widget = convertView.findViewById(android.R.id.widget_frame);
convertView.setTag(holder);
return holder;

2
src/com/android/settings/display/ScreenResolutionFragment.java
View File

@@ -108,7 +108,7 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
footerPreference.setTitle(R.string.screen_resolution_footer);
footerPreference.setSelectable(false);
footerPreference.setLayoutResource(
com.android.settingslib.widget.R.layout.preference_footer);
com.android.settingslib.widget.preference.footer.R.layout.preference_footer);
screen.addPreference(footerPreference);
}

4
src/com/android/settings/display/ScreenTimeoutSettings.java
View File

@@ -129,7 +129,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy);
mPrivacyPreference.setSelectable(false);
mPrivacyPreference.setLayoutResource(
com.android.settingslib.widget.R.layout.preference_footer);
com.android.settingslib.widget.preference.footer.R.layout.preference_footer);
mPrivacyManager = SensorPrivacyManager.getInstance(context);
mPrivacyChangedListener = (sensor, enabled) -> mAdaptiveSleepController.updatePreference();
}
@@ -203,7 +203,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy);
mPrivacyPreference.setSelectable(false);
mPrivacyPreference.setLayoutResource(
com.android.settingslib.widget.R.layout.preference_footer);
com.android.settingslib.widget.preference.footer.R.layout.preference_footer);
if (isScreenAttentionAvailable(getContext())) {
mAdaptiveSleepPermissionController.addToScreen(screen);

2
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -271,7 +271,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
return;
}
setPinnedHeaderView(com.android.settingslib.widget.R.layout.progress_header);
setPinnedHeaderView(com.android.settingslib.widget.progressbar.R.layout.progress_header);
setProgressBarVisible(false);
if (hasWifiManager()) {

4
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -195,8 +195,8 @@ public class NetworkSelectSettings extends DashboardFragment {
final Activity activity = getActivity();
if (activity != null) {
mProgressHeader = setPinnedHeaderView(
com.android.settingslib.widget.R.layout.progress_header)
.findViewById(com.android.settingslib.widget.R.id.progress_bar_animation);
com.android.settingslib.widget.progressbar.R.layout.progress_header)
.findViewById(com.android.settingslib.widget.progressbar.R.id.progress_bar_animation);
setProgressBarVisible(false);
}
forceUpdateConnectedPreferenceCategory();

2
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -85,7 +85,7 @@ public class AndroidBeam extends InstrumentedFragment
return new View(getContext());
}
mView = inflater.inflate(
com.android.settingslib.widget.R.layout.preference_footer, container, false);
com.android.settingslib.widget.preference.footer.R.layout.preference_footer, container, false);
ImageView iconInfo = mView.findViewById(android.R.id.icon);
iconInfo.setImageResource(R.drawable.ic_info_outline_24dp);

4
src/com/android/settings/search/actionbar/SearchMenuController.java
View File

@@ -86,8 +86,8 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
return;
}
final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
com.android.settingslib.search.R.string.search_menu);
searchItem.setIcon(com.android.settingslib.search.R.drawable.ic_search_24dp);
com.android.settingslib.search.widget.R.string.search_menu);
searchItem.setIcon(com.android.settingslib.search.widget.R.drawable.ic_search_24dp);
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
searchItem.setOnMenuItemClickListener(target -> {

2
src/com/android/settings/security/CredentialManagementAppHeaderController.java
View File

@@ -83,7 +83,7 @@ public class CredentialManagementAppHeaderController extends BasePreferenceContr
TextView titleView = headerPref.findViewById(R.id.entity_header_title);
TextView summary1 = headerPref.findViewById(R.id.entity_header_summary);
TextView summary2 = headerPref.findViewById(
com.android.settingslib.widget.R.id.entity_header_second_summary);
com.android.settingslib.widget.preference.layout.R.id.entity_header_second_summary);
summary2.setVisibility(View.GONE);
try {

2
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -227,7 +227,7 @@ public class SettingsSliceProvider extends SliceProvider {
final boolean nightMode = Utils.isNightMode(getContext());
if (mNightMode == null) {
mNightMode = nightMode;
getContext().setTheme(com.android.settingslib.widget.R.style.Theme_SettingsBase);
getContext().setTheme(com.android.settingslib.widget.theme.R.style.Theme_SettingsBase);
} else if (mNightMode != nightMode) {
Log.d(TAG, "Night mode changed, reload theme");
mNightMode = nightMode;

2
src/com/android/settings/vpn2/VpnInfoPreference.java
View File

@@ -71,7 +71,7 @@ public class VpnInfoPreference extends RestrictedPreference implements View.OnCl
// Hide the divider from view
final View divider =
holder.findViewById(com.android.settingslib.widget.R.id.two_target_divider);
holder.findViewById(com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
divider.setVisibility(View.GONE);
}

12
src/com/android/settings/widget/AppCheckBoxPreference.java
View File

@@ -31,20 +31,24 @@ import androidx.preference.PreferenceViewHolder;
public class AppCheckBoxPreference extends CheckBoxPreference {
public AppCheckBoxPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(com.android.settingslib.widget.R.layout.preference_app);
setLayoutResource(com.android.settingslib.widget.preference.app.R.layout.preference_app);
}
public AppCheckBoxPreference(Context context) {
super(context);
setLayoutResource(com.android.settingslib.widget.R.layout.preference_app);
setLayoutResource(com.android.settingslib.widget.preference.app.R.layout.preference_app);
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
final LinearLayout layout = (LinearLayout) holder
.findViewById(com.android.settingslib.widget.R.id.summary_container);
// NOTE: All the summary_container resources IDs in the different dependency widget packages
// are equivalent, so it does not matter which one we use. For example,
// com.android.settingslib.widget.preference.radio.R.id.summary_container ==
// com.android.settingslib.widget.preference.selector.R.id.summary_container
final LinearLayout layout = (LinearLayout) holder.findViewById(
com.android.settingslib.widget.preference.radio.R.id.summary_container);
if (layout != null) {
// If summary doesn't exist, make it gone
layout.setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);

8
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -110,7 +110,7 @@ public class EntityHeaderController {
mHeader = header;
} else {
mHeader = LayoutInflater.from(fragment.getContext())
.inflate(com.android.settingslib.widget.R.layout.settings_entity_header,
.inflate(com.android.settingslib.widget.preference.layout.R.layout.settings_entity_header,
null /* root */);
}
}
@@ -236,9 +236,9 @@ public class EntityHeaderController {
}
setText(R.id.entity_header_title, mLabel);
setText(R.id.entity_header_summary, mSummary);
setText(com.android.settingslib.widget.R.id.entity_header_second_summary, mSecondSummary);
setText(com.android.settingslib.widget.preference.layout.R.id.entity_header_second_summary, mSecondSummary);
if (mIsInstantApp) {
setText(com.android.settingslib.widget.R.id.install_type,
setText(com.android.settingslib.widget.preference.layout.R.id.install_type,
mHeader.getResources().getString(R.string.install_type_instant));
}
@@ -254,7 +254,7 @@ public class EntityHeaderController {
*/
public EntityHeaderController bindHeaderButtons() {
final View entityHeaderContent = mHeader.findViewById(
com.android.settingslib.widget.R.id.entity_header_content);
com.android.settingslib.widget.preference.layout.R.id.entity_header_content);
final ImageButton button1 = mHeader.findViewById(android.R.id.button1);
final ImageButton button2 = mHeader.findViewById(android.R.id.button2);
bindAppInfoLink(entityHeaderContent);

2
src/com/android/settings/widget/SingleTargetGearPreference.java
View File

@@ -59,7 +59,7 @@ public class SingleTargetGearPreference extends Preference {
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
final View divider = holder.findViewById(
com.android.settingslib.widget.R.id.two_target_divider);
com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
if (divider != null) {
divider.setVisibility(View.INVISIBLE);
}

2
src/com/android/settings/wifi/ConnectedWifiEntryPreference.java
View File

@@ -56,7 +56,7 @@ public class ConnectedWifiEntryPreference extends LongPressWifiEntryPreference i
holder.findViewById(R.id.settings_button_no_background).setVisibility(
canSignIn ? View.INVISIBLE : View.VISIBLE);
gear.setVisibility(canSignIn ? View.VISIBLE : View.INVISIBLE);
holder.findViewById(com.android.settingslib.widget.R.id.two_target_divider).setVisibility(
holder.findViewById(com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider).setVisibility(
canSignIn ? View.VISIBLE : View.INVISIBLE);
}

2
src/com/android/settings/wifi/LinkablePreference.java
View File

@@ -49,7 +49,7 @@ public class LinkablePreference extends Preference {
public LinkablePreference(Context ctx, AttributeSet attrs) {
this(ctx, attrs, TypedArrayUtils.getAttr(
ctx, com.android.settingslib.widget.R.attr.footerPreferenceStyle,
ctx, com.android.settingslib.widget.theme.R.attr.footerPreferenceStyle,
android.R.attr.preferenceStyle));
}

2
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -326,7 +326,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
view = mInflater.inflate(mResourceId, parent, false);
final View divider = view.findViewById(
com.android.settingslib.widget.R.id.two_target_divider);
com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
divider.setVisibility(View.GONE);
}

2
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -122,7 +122,7 @@ public class WifiEntryPreference extends RestrictedPreference implements
view.itemView.setContentDescription(mContentDescription);
// Turn off divider
view.findViewById(com.android.settingslib.widget.R.id.two_target_divider)
view.findViewById(com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider)
.setVisibility(View.INVISIBLE);
// Enable the icon button when the help string in this WifiEntry is not null.

2
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -550,7 +550,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
}
final View divider = view.findViewById(
com.android.settingslib.widget.R.id.two_target_divider);
com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
if (divider != null) {
divider.setVisibility(View.GONE);
}

4
src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
View File

@@ -68,7 +68,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
private void initialize() {
// TODO(b/129019971): use methods of divider line in parent object
setLayoutResource(com.android.settingslib.widget.R.layout.preference_two_target);
setLayoutResource(com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target);
setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
mShareIconDrawable = getDrawable(R.drawable.ic_qrcode_24dp);
@@ -80,7 +80,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
final ImageButton shareButton = (ImageButton) holder.findViewById(R.id.button_icon);
final View dividerView = holder.findViewById(
com.android.settingslib.widget.R.id.two_target_divider);
com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
if (mVisible) {
shareButton.setOnClickListener(mClickListener);

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