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

Commit dd2784bb 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 udc-dev-plus-aosp am: 65667c84

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



Change-Id: I20c3cbfefa97672efde639f3589b22980a537802
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88df9f73 65667c84

packages/SystemUI/Android.bp

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

        "res",

    ],

    use_resource_processor: true,

    static_libs: [

        "WifiTrackerLib",

        "WindowManager-Shell",
@@ -510,6 +511,7 @@ android_app { 
    ],

    resource_dirs: [],



    use_resource_processor: true,

    platform_apis: true,

    system_ext_specific: true,

    certificate: "platform",

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.view.ViewTreeObserver 
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

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

+5 −2
Original line number Diff line number Diff line
@@ -68,7 +68,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(
@@ -81,7 +83,8 @@ public class KeyguardClockSwitch extends RelativeLayout { 
    /** Returns a region for the small clock to position itself, based on the given parent. */

    public static Rect getSmallClockRegion(ViewGroup parent) {

        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(

                parent.getLeft(),

                parent.getTop(),

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

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

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

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