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

Commit ee955599 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Global Actions - Fix shutdown ui text color"

parents 43280450 0c12b4d0

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
    <color name="global_actions_emergency_background">@color/GM2_red_400</color>

    <color name="global_actions_emergency_text">@color/GM2_grey_100</color>



    <color name="global_actions_shutdown_ui_text">@color/control_primary_text</color>



    <!-- Tint color for the content on the notification overflow card. -->

    <color name="keyguard_overflow_content_color">#ff686868</color>

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java

+8 −2
Original line number Diff line number Diff line
@@ -140,8 +140,14 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
        d.setContentView(R.layout.shutdown_dialog);

        d.setCancelable(false);



        int color = Utils.getColorAttrDefaultColor(mContext,

        int color;

        if (mBlurUtils.supportsBlursOnWindows()) {

            color = Utils.getColorAttrDefaultColor(mContext,

                    com.android.systemui.R.attr.wallpaperTextColor);

        } else {

            color = mContext.getResources().getColor(

                    com.android.systemui.R.color.global_actions_shutdown_ui_text);

        }



        ProgressBar bar = d.findViewById(R.id.progress);

        bar.getIndeterminateDrawable().setTint(color);