Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dea4c261 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

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

Merge "Fix references to resources using incorrect packages in SystemUI-core" into main am: 35d5d62d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650577



Change-Id: I80f6fdcb49923223a3d4cb2502fbf9be949e188c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67075c41 35d5d62d

packages/SystemUI/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,7 @@ android_library { 
        "res-keyguard",

        "res-keyguard",

        "res",

        "res",

    ],

    ],

    use_resource_processor: true,

    static_libs: [

    static_libs: [

        "WifiTrackerLib",

        "WifiTrackerLib",

        "WindowManager-Shell",

        "WindowManager-Shell",
@@ -452,6 +453,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",

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,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

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -52,7 +52,9 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        int largeClockTopMargin = parent.getResources()

        int largeClockTopMargin = parent.getResources()

                .getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin);

                .getDimensionPixelSize(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(
@@ -152,7 +154,8 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        if (mClock != null) {

        if (mClock != null) {

            if (mSmallClockFrame.isLaidOut()) {

            if (mSmallClockFrame.isLaidOut()) {

                int targetHeight =  getResources()

                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(

                mClock.getSmallClock().getEvents().onTargetRegionChanged(new Rect(

                        mSmallClockFrame.getLeft(),

                        mSmallClockFrame.getLeft(),

                        mSmallClockFrame.getTop(),

                        mSmallClockFrame.getTop(),

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1150,7 +1150,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));

packages/SystemUI/src/com/android/systemui/GuestSessionNotification.java

+7 −4
Original line number Original line Diff line number Diff line
@@ -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)