Fix references to resources using incorrect packages in SystemUI-core

Using ResourceProcessorBusyBox to speed up resource processing
reuires using the correct package to reference resources from
android_library dependencies.  Fix them, and set use_resource_processor: true.
This saves around 47 seconds when compiling the SystemUI module, and
a similar amount when compiling the SystemUI-core module.

Bug: 284023594
Test: m SystemUI
Change-Id: I8f825ef549a5e0bd67e10d260ecdc3353a526fdb
This commit is contained in:
Colin Cross
2023-06-21 11:22:11 -07:00
parent 62444ddf32
commit 197fec941e
31 changed files with 91 additions and 56 deletions

View File

@@ -154,6 +154,7 @@ android_library {
"res-keyguard", "res-keyguard",
"res", "res",
], ],
use_resource_processor: true,
static_libs: [ static_libs: [
"WifiTrackerLib", "WifiTrackerLib",
"WindowManager-Shell", "WindowManager-Shell",
@@ -528,6 +529,7 @@ android_app {
], ],
resource_dirs: [], resource_dirs: [],
use_resource_processor: true,
platform_apis: true, platform_apis: true,
system_ext_specific: true, system_ext_specific: true,
certificate: "platform", certificate: "platform",

View File

@@ -31,7 +31,7 @@ import android.widget.FrameLayout
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import com.android.systemui.R import com.android.systemui.customization.R
import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.broadcast.BroadcastDispatcher
import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dagger.qualifiers.Main

View File

@@ -66,9 +66,12 @@ public class KeyguardClockSwitch extends RelativeLayout {
/** Returns a region for the large clock to position itself, based on the given parent. */ /** Returns a region for the large clock to position itself, based on the given parent. */
public static Rect getLargeClockRegion(ViewGroup parent) { public static Rect getLargeClockRegion(ViewGroup parent) {
int largeClockTopMargin = parent.getResources() int largeClockTopMargin = parent.getResources()
.getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin); .getDimensionPixelSize(
com.android.systemui.customization.R.dimen.keyguard_large_clock_top_margin);
int targetHeight = parent.getResources() int targetHeight = parent.getResources()
.getDimensionPixelSize(R.dimen.large_clock_text_size) * 2; .getDimensionPixelSize(
com.android.systemui.customization.R.dimen.large_clock_text_size)
* 2;
int top = parent.getHeight() / 2 - targetHeight / 2 int top = parent.getHeight() / 2 - targetHeight / 2
+ largeClockTopMargin / 2; + largeClockTopMargin / 2;
return new Rect( return new Rect(
@@ -81,7 +84,8 @@ public class KeyguardClockSwitch extends RelativeLayout {
/** Returns a region for the small clock to position itself, based on the given parent. */ /** Returns a region for the small clock to position itself, based on the given parent. */
public static Rect getSmallClockRegion(ViewGroup parent) { public static Rect getSmallClockRegion(ViewGroup parent) {
int targetHeight = parent.getResources() int targetHeight = parent.getResources()
.getDimensionPixelSize(R.dimen.small_clock_text_size); .getDimensionPixelSize(
com.android.systemui.customization.R.dimen.small_clock_text_size);
return new Rect( return new Rect(
parent.getLeft(), parent.getLeft(),
parent.getTop(), parent.getTop(),

View File

@@ -229,7 +229,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
mKeyguardSmallClockTopMargin = mKeyguardSmallClockTopMargin =
mView.getResources().getDimensionPixelSize(R.dimen.keyguard_clock_top_margin); mView.getResources().getDimensionPixelSize(R.dimen.keyguard_clock_top_margin);
mKeyguardLargeClockTopMargin = mKeyguardLargeClockTopMargin =
mView.getResources().getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin); mView.getResources().getDimensionPixelSize(
com.android.systemui.customization.R.dimen.keyguard_large_clock_top_margin);
mKeyguardDateWeatherViewInvisibility = mKeyguardDateWeatherViewInvisibility =
mView.getResources().getInteger(R.integer.keyguard_date_weather_view_invisibility); mView.getResources().getInteger(R.integer.keyguard_date_weather_view_invisibility);
@@ -365,7 +366,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
mKeyguardSmallClockTopMargin = mKeyguardSmallClockTopMargin =
mView.getResources().getDimensionPixelSize(R.dimen.keyguard_clock_top_margin); mView.getResources().getDimensionPixelSize(R.dimen.keyguard_clock_top_margin);
mKeyguardLargeClockTopMargin = mKeyguardLargeClockTopMargin =
mView.getResources().getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin); mView.getResources().getDimensionPixelSize(
com.android.systemui.customization.R.dimen.keyguard_large_clock_top_margin);
mKeyguardDateWeatherViewInvisibility = mKeyguardDateWeatherViewInvisibility =
mView.getResources().getInteger(R.integer.keyguard_date_weather_view_invisibility); mView.getResources().getInteger(R.integer.keyguard_date_weather_view_invisibility);
mView.updateClockTargetRegions(); mView.updateClockTargetRegions();

View File

@@ -1167,7 +1167,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
} }
drawable.setTint(iconColor); drawable.setTint(iconColor);
Drawable bg = context.getDrawable(R.drawable.user_avatar_bg); Drawable bg = context.getDrawable(
com.android.settingslib.R.drawable.user_avatar_bg);
bg.setTintBlendMode(BlendMode.DST); bg.setTintBlendMode(BlendMode.DST);
bg.setTint(Utils.getColorAttrDefaultColor(context, bg.setTint(Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.colorSurfaceVariant)); com.android.internal.R.attr.colorSurfaceVariant));

View File

@@ -64,12 +64,15 @@ public final class GuestSessionNotification {
} }
String contentText; String contentText;
if (userInfo.isEphemeral()) { if (userInfo.isEphemeral()) {
contentText = mContext.getString(R.string.guest_notification_ephemeral); contentText = mContext.getString(
com.android.settingslib.R.string.guest_notification_ephemeral);
} else if (isGuestFirstLogin) { } else if (isGuestFirstLogin) {
contentText = mContext.getString(R.string.guest_notification_non_ephemeral); contentText = mContext.getString(
com.android.settingslib.R.string.guest_notification_non_ephemeral);
} else { } else {
contentText = mContext.getString( contentText = mContext.getString(
R.string.guest_notification_non_ephemeral_non_first_login); com.android.settingslib.R.string
.guest_notification_non_ephemeral_non_first_login);
} }
final Intent guestExitIntent = new Intent( final Intent guestExitIntent = new Intent(
@@ -89,7 +92,7 @@ public final class GuestSessionNotification {
Notification.Builder builder = new Notification.Builder(mContext, Notification.Builder builder = new Notification.Builder(mContext,
NotificationChannels.ALERTS) NotificationChannels.ALERTS)
.setSmallIcon(R.drawable.ic_account_circle) .setSmallIcon(com.android.settingslib.R.drawable.ic_account_circle)
.setContentTitle(mContext.getString(R.string.guest_notification_session_active)) .setContentTitle(mContext.getString(R.string.guest_notification_session_active))
.setContentText(contentText) .setContentText(contentText)
.setPriority(Notification.PRIORITY_DEFAULT) .setPriority(Notification.PRIORITY_DEFAULT)

View File

@@ -24,7 +24,6 @@ import android.view.MotionEvent;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.dynamicanimation.animation.DynamicAnimation; import androidx.dynamicanimation.animation.DynamicAnimation;
import com.android.systemui.R;
import com.android.wm.shell.common.bubbles.DismissView; import com.android.wm.shell.common.bubbles.DismissView;
import com.android.wm.shell.common.magnetictarget.MagnetizedObject; import com.android.wm.shell.common.magnetictarget.MagnetizedObject;
@@ -157,9 +156,9 @@ class DismissAnimationController {
void updateResources() { void updateResources() {
final float maxDismissSize = mDismissView.getResources().getDimensionPixelSize( final float maxDismissSize = mDismissView.getResources().getDimensionPixelSize(
R.dimen.dismiss_circle_size); com.android.wm.shell.R.dimen.dismiss_circle_size);
mMinDismissSize = mDismissView.getResources().getDimensionPixelSize( mMinDismissSize = mDismissView.getResources().getDimensionPixelSize(
R.dimen.dismiss_circle_small); com.android.wm.shell.R.dimen.dismiss_circle_small);
mSizePercent = mMinDismissSize / maxDismissSize; mSizePercent = mMinDismissSize / maxDismissSize;
} }

View File

@@ -106,7 +106,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
TypedArray atts = context.obtainStyledAttributes(attrs, R.styleable.BatteryMeterView, TypedArray atts = context.obtainStyledAttributes(attrs, R.styleable.BatteryMeterView,
defStyle, 0); defStyle, 0);
final int frameColor = atts.getColor(R.styleable.BatteryMeterView_frameColor, final int frameColor = atts.getColor(R.styleable.BatteryMeterView_frameColor,
context.getColor(R.color.meter_background_color)); context.getColor(com.android.settingslib.R.color.meter_background_color));
mPercentageStyleId = atts.getResourceId(R.styleable.BatteryMeterView_textAppearance, 0); mPercentageStyleId = atts.getResourceId(R.styleable.BatteryMeterView_textAppearance, 0);
mDrawable = new AccessorizedBatteryDrawable(context, frameColor); mDrawable = new AccessorizedBatteryDrawable(context, frameColor);
atts.recycle(); atts.recycle();

View File

@@ -434,7 +434,7 @@ private fun LottieAnimationView.addOverlayDynamicColor(
for (key in listOf(".blue600", ".blue400")) { for (key in listOf(".blue600", ".blue400")) {
addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) { addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter( PorterDuffColorFilter(
context.getColor(R.color.settingslib_color_blue400), context.getColor(com.android.settingslib.R.color.settingslib_color_blue400),
PorterDuff.Mode.SRC_ATOP PorterDuff.Mode.SRC_ATOP
) )
} }

View File

@@ -61,7 +61,7 @@ class ContrastDialog(
) )
dismiss() dismiss()
} }
setPositiveButton(R.string.done) { _, _ -> dismiss() } setPositiveButton(com.android.settingslib.R.string.done) { _, _ -> dismiss() }
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
contrastButtons = contrastButtons =

View File

@@ -227,8 +227,9 @@ constructor(
val startPadding: Int = val startPadding: Int =
with(context.resources) { with(context.resources) {
getDimensionPixelSize(R.dimen.clock_padding_start) + getDimensionPixelSize(
getDimensionPixelSize(R.dimen.below_clock_padding_start) com.android.systemui.customization.R.dimen.clock_padding_start
) + getDimensionPixelSize(R.dimen.below_clock_padding_start)
} }
val endPadding: Int = val endPadding: Int =
@@ -375,15 +376,21 @@ constructor(
val layoutParams = val layoutParams =
FrameLayout.LayoutParams( FrameLayout.LayoutParams(
FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT,
resources.getDimensionPixelSize(R.dimen.small_clock_height) resources.getDimensionPixelSize(
com.android.systemui.customization.R.dimen.small_clock_height
)
) )
layoutParams.topMargin = layoutParams.topMargin =
KeyguardPreviewSmartspaceViewModel.getStatusBarHeight(resources) + KeyguardPreviewSmartspaceViewModel.getStatusBarHeight(resources) +
resources.getDimensionPixelSize(R.dimen.small_clock_padding_top) resources.getDimensionPixelSize(
com.android.systemui.customization.R.dimen.small_clock_padding_top
)
hostView.layoutParams = layoutParams hostView.layoutParams = layoutParams
hostView.setPaddingRelative( hostView.setPaddingRelative(
resources.getDimensionPixelSize(R.dimen.clock_padding_start), resources.getDimensionPixelSize(
com.android.systemui.customization.R.dimen.clock_padding_start
),
0, 0,
0, 0,
0 0

View File

@@ -71,8 +71,12 @@ constructor(
fun getSmallClockSmartspaceTopPadding(resources: Resources): Int { fun getSmallClockSmartspaceTopPadding(resources: Resources): Int {
return with(resources) { return with(resources) {
getStatusBarHeight(this) + getStatusBarHeight(this) +
getDimensionPixelSize(R.dimen.small_clock_padding_top) + getDimensionPixelSize(
getDimensionPixelSize(R.dimen.small_clock_height) com.android.systemui.customization.R.dimen.small_clock_padding_top
) +
getDimensionPixelSize(
com.android.systemui.customization.R.dimen.small_clock_height
)
} }
} }

View File

@@ -119,7 +119,7 @@ internal constructor(
::AnimatingColorTransition ::AnimatingColorTransition
) )
val bgColor = context.getColor(com.android.systemui.R.color.material_dynamic_secondary95) val bgColor = context.getColor(com.google.android.material.R.color.material_dynamic_secondary95)
val surfaceColor = val surfaceColor =
animatingColorTransitionFactory(bgColor, ::surfaceFromScheme) { surfaceColor -> animatingColorTransitionFactory(bgColor, ::surfaceFromScheme) { surfaceColor ->
val colorList = ColorStateList.valueOf(surfaceColor) val colorList = ColorStateList.valueOf(surfaceColor)

View File

@@ -68,7 +68,9 @@ constructor(
} }
launch { launch {
val label = labelLoader.loadLabel(task.userId, component) val label = labelLoader.loadLabel(task.userId, component)
root.contentDescription = label ?: root.context.getString(R.string.unknown) root.contentDescription =
label
?: root.context.getString(com.android.settingslib.R.string.unknown)
} }
} }
launch { launch {

View File

@@ -33,7 +33,6 @@ import android.view.ContextThemeWrapper;
import androidx.core.graphics.drawable.RoundedBitmapDrawable; import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.R;
class PeopleStoryIconFactory implements AutoCloseable { class PeopleStoryIconFactory implements AutoCloseable {
@@ -59,7 +58,8 @@ class PeopleStoryIconFactory implements AutoCloseable {
mIconSize = mDensity * iconSizeDp; mIconSize = mDensity * iconSizeDp;
mPackageManager = pm; mPackageManager = pm;
mIconDrawableFactory = iconDrawableFactory; mIconDrawableFactory = iconDrawableFactory;
mImportantConversationColor = mContext.getColor(R.color.important_conversation); mImportantConversationColor = mContext.getColor(
com.android.launcher3.icons.R.color.important_conversation);
mAccentColor = Utils.getColorAttr(mContext, mAccentColor = Utils.getColorAttr(mContext,
com.android.internal.R.attr.colorAccentPrimaryVariant).getDefaultColor(); com.android.internal.R.attr.colorAccentPrimaryVariant).getDefaultColor();
} }

View File

@@ -180,7 +180,8 @@ public class HotspotTile extends QSTileImpl<BooleanState> {
private String getSecondaryLabel(boolean isActive, boolean isTransient, private String getSecondaryLabel(boolean isActive, boolean isTransient,
boolean isDataSaverEnabled, int numConnectedDevices, boolean isWifiTetheringAllowed) { boolean isDataSaverEnabled, int numConnectedDevices, boolean isWifiTetheringAllowed) {
if (!isWifiTetheringAllowed) { if (!isWifiTetheringAllowed) {
return mContext.getString(R.string.wifitrackerlib_admin_restricted_network); return mContext.getString(
com.android.wifitrackerlib.R.string.wifitrackerlib_admin_restricted_network);
} else if (isTransient) { } else if (isTransient) {
return mContext.getString(R.string.quick_settings_hotspot_secondary_label_transient); return mContext.getString(R.string.quick_settings_hotspot_secondary_label_transient);
} else if (isDataSaverEnabled) { } else if (isDataSaverEnabled) {

View File

@@ -1414,8 +1414,8 @@ public class NotificationContentView extends FrameLayout implements Notification
if (shouldShowBubbleButton(entry)) { if (shouldShowBubbleButton(entry)) {
// explicitly resolve drawable resource using SystemUI's theme // explicitly resolve drawable resource using SystemUI's theme
Drawable d = mContext.getDrawable(entry.isBubble() Drawable d = mContext.getDrawable(entry.isBubble()
? R.drawable.bubble_ic_stop_bubble ? com.android.wm.shell.R.drawable.bubble_ic_stop_bubble
: R.drawable.bubble_ic_create_bubble); : com.android.wm.shell.R.drawable.bubble_ic_create_bubble);
String contentDescription = mContext.getResources().getString(entry.isBubble() String contentDescription = mContext.getResources().getString(entry.isBubble()
? R.string.notification_conversation_unbubble ? R.string.notification_conversation_unbubble

View File

@@ -23,7 +23,6 @@ import android.graphics.Rect;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.widget.ImageView; import android.widget.ImageView;
import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpManager;
@@ -62,8 +61,10 @@ public class DarkIconDispatcherImpl implements SysuiDarkIconDispatcher,
Context context, Context context,
LightBarTransitionsController.Factory lightBarTransitionsControllerFactory, LightBarTransitionsController.Factory lightBarTransitionsControllerFactory,
DumpManager dumpManager) { DumpManager dumpManager) {
mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone); mDarkModeIconColorSingleTone = context.getColor(
mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone); com.android.settingslib.R.color.dark_mode_icon_color_single_tone);
mLightModeIconColorSingleTone = context.getColor(
com.android.settingslib.R.color.light_mode_icon_color_single_tone);
mTransitionsController = lightBarTransitionsControllerFactory.create(this); mTransitionsController = lightBarTransitionsControllerFactory.create(this);

View File

@@ -421,8 +421,9 @@ public class KeyguardStatusBarView extends RelativeLayout {
@ColorInt int textColor = Utils.getColorAttrDefaultColor(mContext, @ColorInt int textColor = Utils.getColorAttrDefaultColor(mContext,
R.attr.wallpaperTextColor); R.attr.wallpaperTextColor);
@ColorInt int iconColor = Utils.getColorStateListDefaultColor(mContext, @ColorInt int iconColor = Utils.getColorStateListDefaultColor(mContext,
Color.luminance(textColor) < 0.5 ? R.color.dark_mode_icon_color_single_tone : Color.luminance(textColor) < 0.5
R.color.light_mode_icon_color_single_tone); ? com.android.settingslib.R.color.dark_mode_icon_color_single_tone
: com.android.settingslib.R.color.light_mode_icon_color_single_tone);
float intensity = textColor == Color.WHITE ? 0 : 1; float intensity = textColor == Color.WHITE ? 0 : 1;
mCarrierLabel.setTextColor(iconColor); mCarrierLabel.setTextColor(iconColor);
@@ -430,7 +431,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
if (userSwitcherName != null) { if (userSwitcherName != null) {
userSwitcherName.setTextColor(Utils.getColorStateListDefaultColor( userSwitcherName.setTextColor(Utils.getColorStateListDefaultColor(
mContext, mContext,
R.color.light_mode_icon_color_single_tone)); com.android.settingslib.R.color.light_mode_icon_color_single_tone));
} }
if (iconManager != null) { if (iconManager != null) {

View File

@@ -35,7 +35,6 @@ import androidx.annotation.NonNull;
import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.colorextraction.ColorExtractor.GradientColors;
import com.android.internal.view.AppearanceRegion; import com.android.internal.view.AppearanceRegion;
import com.android.systemui.Dumpable; import com.android.systemui.Dumpable;
import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpManager;
import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.navigationbar.NavigationModeController;
@@ -122,8 +121,10 @@ public class LightBarController implements BatteryController.BatteryStateChangeC
NavigationModeController navModeController, NavigationModeController navModeController,
DumpManager dumpManager, DumpManager dumpManager,
DisplayTracker displayTracker) { DisplayTracker displayTracker) {
mDarkIconColor = ctx.getColor(R.color.dark_mode_icon_color_single_tone); mDarkIconColor = ctx.getColor(
mLightIconColor = ctx.getColor(R.color.light_mode_icon_color_single_tone); com.android.settingslib.R.color.dark_mode_icon_color_single_tone);
mLightIconColor = ctx.getColor(
com.android.settingslib.R.color.light_mode_icon_color_single_tone);
mStatusBarIconController = (SysuiDarkIconDispatcher) darkIconDispatcher; mStatusBarIconController = (SysuiDarkIconDispatcher) darkIconDispatcher;
mBatteryController = batteryController; mBatteryController = batteryController;
mBatteryController.addCallback(this); mBatteryController.addCallback(this);

View File

@@ -427,7 +427,8 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh
// We first look for the background on the dialogContentWithBackground added by // We first look for the background on the dialogContentWithBackground added by
// DialogLaunchAnimator. If it's not there, we use the background of the DecorView. // DialogLaunchAnimator. If it's not there, we use the background of the DecorView.
View viewWithBackground = decorView.findViewByPredicate( View viewWithBackground = decorView.findViewByPredicate(
view -> view.getTag(R.id.tag_dialog_background) != null); view -> view.getTag(
com.android.systemui.animation.R.id.tag_dialog_background) != null);
Drawable background = viewWithBackground != null ? viewWithBackground.getBackground() Drawable background = viewWithBackground != null ? viewWithBackground.getBackground()
: decorView.getBackground(); : decorView.getBackground();
Insets insets = background != null ? background.getOpticalInsets() : Insets.NONE; Insets insets = background != null ? background.getOpticalInsets() : Insets.NONE;

View File

@@ -319,7 +319,7 @@ public class KeyguardQsUserSwitchController extends ViewController<FrameLayout>
drawable = new CircleFramedDrawable(mCurrentUser.picture, avatarSize); drawable = new CircleFramedDrawable(mCurrentUser.picture, avatarSize);
} }
Drawable bg = mContext.getDrawable(R.drawable.user_avatar_bg); Drawable bg = mContext.getDrawable(com.android.settingslib.R.drawable.user_avatar_bg);
drawable = new LayerDrawable(new Drawable[]{bg, drawable}); drawable = new LayerDrawable(new Drawable[]{bg, drawable});
return drawable; return drawable;
} }

View File

@@ -534,7 +534,7 @@ public class KeyguardUserSwitcherController extends ViewController<KeyguardUserS
} }
drawable.setTint(mResources.getColor(iconColorRes, mContext.getTheme())); drawable.setTint(mResources.getColor(iconColorRes, mContext.getTheme()));
Drawable bg = mContext.getDrawable(R.drawable.user_avatar_bg); Drawable bg = mContext.getDrawable(com.android.settingslib.R.drawable.user_avatar_bg);
drawable = new LayerDrawable(new Drawable[]{bg, drawable}); drawable = new LayerDrawable(new Drawable[]{bg, drawable});
return drawable; return drawable;
} }

View File

@@ -61,7 +61,7 @@ public class TunerActivity extends Activity implements
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setTheme(R.style.Theme_AppCompat_DayNight); setTheme(androidx.appcompat.R.style.Theme_AppCompat_DayNight);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);

View File

@@ -776,7 +776,9 @@ constructor(
userId: Int, userId: Int,
): Drawable { ): Drawable {
if (isGuest) { if (isGuest) {
return checkNotNull(applicationContext.getDrawable(R.drawable.ic_account_circle)) return checkNotNull(
applicationContext.getDrawable(com.android.settingslib.R.drawable.ic_account_circle)
)
} }
// TODO(b/246631653): cache the bitmaps to avoid the background work to fetch them. // TODO(b/246631653): cache the bitmaps to avoid the background work to fetch them.

View File

@@ -42,13 +42,13 @@ object LegacyUserUiHelper {
isManageUsers: Boolean, isManageUsers: Boolean,
): Int { ): Int {
return if (isAddUser && isTablet) { return if (isAddUser && isTablet) {
R.drawable.ic_account_circle_filled com.android.settingslib.R.drawable.ic_account_circle_filled
} else if (isAddUser) { } else if (isAddUser) {
R.drawable.ic_add R.drawable.ic_add
} else if (isGuest) { } else if (isGuest) {
R.drawable.ic_account_circle com.android.settingslib.R.drawable.ic_account_circle
} else if (isAddSupervisedUser) { } else if (isAddSupervisedUser) {
R.drawable.ic_add_supervised_user com.android.settingslib.R.drawable.ic_add_supervised_user
} else if (isManageUsers) { } else if (isManageUsers) {
R.drawable.ic_manage_users R.drawable.ic_manage_users
} else { } else {

View File

@@ -128,7 +128,7 @@ constructor(
viewKey = model.id, viewKey = model.id,
name = name =
if (model.isGuest && model.isSelected) { if (model.isGuest && model.isSelected) {
Text.Resource(R.string.guest_exit_quick_settings_button) Text.Resource(com.android.settingslib.R.string.guest_exit_quick_settings_button)
} else { } else {
model.name model.name
}, },

View File

@@ -112,7 +112,7 @@ public class NotificationChannels implements CoreStartable {
// priority, so it can be shown in all times. // priority, so it can be shown in all times.
nm.createNotificationChannel(new NotificationChannel( nm.createNotificationChannel(new NotificationChannel(
TVPIP, TVPIP,
context.getString(R.string.notification_channel_tv_pip), context.getString(com.android.wm.shell.R.string.notification_channel_tv_pip),
NotificationManager.IMPORTANCE_MAX)); NotificationManager.IMPORTANCE_MAX));
} }
} }

View File

@@ -1807,8 +1807,10 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
if (!ss.dynamic) continue; if (!ss.dynamic) continue;
mDynamic.put(stream, true); mDynamic.put(stream, true);
if (findRow(stream) == null) { if (findRow(stream) == null) {
addRow(stream, R.drawable.ic_volume_remote, R.drawable.ic_volume_remote_mute, true, addRow(stream,
false, true); com.android.settingslib.R.drawable.ic_volume_remote,
com.android.settingslib.R.drawable.ic_volume_remote_mute,
true, false, true);
} }
} }

View File

@@ -48,8 +48,10 @@ final class DotIndicatorDecoration extends RecyclerView.ItemDecoration {
R.dimen.card_carousel_dot_selected_radius); R.dimen.card_carousel_dot_selected_radius);
mDotMargin = context.getResources().getDimensionPixelSize(R.dimen.card_carousel_dot_margin); mDotMargin = context.getResources().getDimensionPixelSize(R.dimen.card_carousel_dot_margin);
mUnselectedColor = context.getColor(R.color.material_dynamic_neutral70); mUnselectedColor = context.getColor(
mSelectedColor = context.getColor(R.color.material_dynamic_neutral100); com.google.android.material.R.color.material_dynamic_neutral70);
mSelectedColor = context.getColor(
com.google.android.material.R.color.material_dynamic_neutral100);
} }
@Override @Override

View File

@@ -278,7 +278,7 @@ public class WalletActivity extends ComponentActivity implements
private Drawable getHomeIndicatorDrawable() { private Drawable getHomeIndicatorDrawable() {
Drawable drawable = getDrawable(R.drawable.ic_close); Drawable drawable = getDrawable(R.drawable.ic_close);
drawable.setTint(getColor(R.color.material_dynamic_neutral70)); drawable.setTint(getColor(com.google.android.material.R.color.material_dynamic_neutral70));
return drawable; return drawable;
} }
} }