Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix references to resources using incorrect packages in SystemUI-core" into main

Browse Source
This commit is contained in:
Colin Cross
2023-08-01 20:46:46 +00:00
committed by Gerrit Code Review
parent 769a63e38a 5ebc32750a
commit 35d5d62deb
25 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/Android.bp
View File

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

2
packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
View File

@@ -30,7 +30,7 @@ import android.widget.FrameLayout
import androidx.annotation.VisibleForTesting
import androidx.lifecycle.Lifecycle
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.dagger.qualifiers.Background
import com.android.systemui.dagger.qualifiers.Main

7
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
View File

@@ -52,7 +52,9 @@ public class KeyguardClockSwitch extends RelativeLayout {
int largeClockTopMargin = parent.getResources()
.getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin);
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
+ largeClockTopMargin / 2;
return new Rect(
@@ -152,7 +154,8 @@ public class KeyguardClockSwitch extends RelativeLayout {
if (mClock != null) {
if (mSmallClockFrame.isLaidOut()) {
int targetHeight = getResources()
.getDimensionPixelSize(R.dimen.small_clock_text_size);
.getDimensionPixelSize(
com.android.systemui.customization.R.dimen.small_clock_text_size);
mClock.getSmallClock().getEvents().onTargetRegionChanged(new Rect(
mSmallClockFrame.getLeft(),
mSmallClockFrame.getTop(),

3
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -1150,7 +1150,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
}
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.setTint(Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.colorSurfaceVariant));

11
packages/SystemUI/src/com/android/systemui/GuestSessionNotification.java
View File

@@ -64,12 +64,15 @@ public final class GuestSessionNotification {
}
String contentText;
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) {
contentText = mContext.getString(R.string.guest_notification_non_ephemeral);
contentText = mContext.getString(
com.android.settingslib.R.string.guest_notification_non_ephemeral);
} else {
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(
@@ -89,7 +92,7 @@ public final class GuestSessionNotification {
Notification.Builder builder = new Notification.Builder(mContext,
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))
.setContentText(contentText)
.setPriority(Notification.PRIORITY_DEFAULT)

2
packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
View File

@@ -106,7 +106,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
TypedArray atts = context.obtainStyledAttributes(attrs, R.styleable.BatteryMeterView,
defStyle, 0);
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);
mDrawable = new AccessorizedBatteryDrawable(context, frameColor);
atts.recycle();

2
packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt
View File

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

2
packages/SystemUI/src/com/android/systemui/media/controls/ui/ColorSchemeTransition.kt
View File

@@ -119,7 +119,7 @@ internal constructor(
::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 =
animatingColorTransitionFactory(bgColor, ::surfaceFromScheme) { surfaceColor ->
val colorList = ColorStateList.valueOf(surfaceColor)

6
packages/SystemUI/src/com/android/systemui/people/PeopleStoryIconFactory.java
View File

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

3
packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
View File

@@ -178,7 +178,8 @@ public class HotspotTile extends QSTileImpl<BooleanState> {
private String getSecondaryLabel(boolean isActive, boolean isTransient,
boolean isDataSaverEnabled, int numConnectedDevices, boolean 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) {
return mContext.getString(R.string.quick_settings_hotspot_secondary_label_transient);
} else if (isDataSaverEnabled) {

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
View File

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

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java
View File

@@ -23,7 +23,6 @@ import android.graphics.Rect;
import android.util.ArrayMap;
import android.widget.ImageView;
import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dump.DumpManager;
@@ -54,8 +53,10 @@ public class DarkIconDispatcherImpl implements SysuiDarkIconDispatcher,
Context context,
LightBarTransitionsController.Factory lightBarTransitionsControllerFactory,
DumpManager dumpManager) {
mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone);
mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone);
mDarkModeIconColorSingleTone = context.getColor(
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);

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
View File

@@ -458,8 +458,9 @@ public class KeyguardStatusBarView extends RelativeLayout {
@ColorInt int textColor = Utils.getColorAttrDefaultColor(mContext,
R.attr.wallpaperTextColor);
@ColorInt int iconColor = Utils.getColorStateListDefaultColor(mContext,
Color.luminance(textColor) < 0.5 ? R.color.dark_mode_icon_color_single_tone :
R.color.light_mode_icon_color_single_tone);
Color.luminance(textColor) < 0.5
? 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;
mCarrierLabel.setTextColor(iconColor);
@@ -467,7 +468,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
if (userSwitcherName != null) {
userSwitcherName.setTextColor(Utils.getColorStateListDefaultColor(
mContext,
R.color.light_mode_icon_color_single_tone));
com.android.settingslib.R.color.light_mode_icon_color_single_tone));
}
if (iconManager != null) {

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java
View File

@@ -32,7 +32,6 @@ import android.view.WindowInsetsController.Appearance;
import com.android.internal.colorextraction.ColorExtractor.GradientColors;
import com.android.internal.view.AppearanceRegion;
import com.android.systemui.Dumpable;
import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.navigationbar.NavigationModeController;
@@ -96,8 +95,10 @@ public class LightBarController implements BatteryController.BatteryStateChangeC
NavigationModeController navModeController,
DumpManager dumpManager,
DisplayTracker displayTracker) {
mDarkIconColor = ctx.getColor(R.color.dark_mode_icon_color_single_tone);
mLightIconColor = ctx.getColor(R.color.light_mode_icon_color_single_tone);
mDarkIconColor = ctx.getColor(
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;
mBatteryController = batteryController;
mBatteryController.addCallback(this);

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
View File

@@ -415,7 +415,8 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh
// We first look for the background on the dialogContentWithBackground added by
// DialogLaunchAnimator. If it's not there, we use the background of the DecorView.
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()
: decorView.getBackground();
Insets insets = background != null ? background.getOpticalInsets() : Insets.NONE;

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java
View File

@@ -319,7 +319,7 @@ public class KeyguardQsUserSwitchController extends ViewController<FrameLayout>
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});
return drawable;
}

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherController.java
View File

@@ -533,7 +533,7 @@ public class KeyguardUserSwitcherController extends ViewController<KeyguardUserS
}
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});
return drawable;
}

2
packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
View File

@@ -61,7 +61,7 @@ public class TunerActivity extends Activity implements
protected void onCreate(Bundle 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);
requestWindowFeature(Window.FEATURE_NO_TITLE);

4
packages/SystemUI/src/com/android/systemui/user/domain/interactor/UserInteractor.kt
View File

@@ -747,7 +747,9 @@ constructor(
userId: Int,
): Drawable {
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.

6
packages/SystemUI/src/com/android/systemui/user/legacyhelper/ui/LegacyUserUiHelper.kt
View File

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

2
packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt
View File

@@ -128,7 +128,7 @@ constructor(
viewKey = model.id,
name =
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 {
model.name
},

2
packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java
View File

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

6
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

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

6
packages/SystemUI/src/com/android/systemui/wallet/ui/DotIndicatorDecoration.java
View File

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

2
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java
View File

@@ -278,7 +278,7 @@ public class WalletActivity extends ComponentActivity implements
private Drawable getHomeIndicatorDrawable() {
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;
}
}