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

Commit d6ce2cca authored by Robert Horvath's avatar Robert Horvath
Browse files

Opaque background for shutdown UI on TV 

The background of the shutdown UI was transparent.
This lead to the text on the shutdown UI being hard
to read, as text from  underneath might shine through.

This change makes the background of the shutdown UI opaque for TVs.

Bug: 152509487
Test: flash build and then factory reset / reboot the device
Change-Id: I620224b9c7b289fbf4db3ffec78007653bea0d71
parent c02e0d8c

packages/SystemUI/res/values-television/dimens.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>

    <!-- Opacity at which the background for the shutdown UI will be drawn. -->

    <item name="shutdown_scrim_behind_alpha" format="float" type="dimen">1.0</item>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -1265,4 +1265,7 @@ 
    <dimen name="screenrecord_status_icon_radius">5dp</dimen>



    <dimen name="kg_user_switcher_text_size">16sp</dimen>



    <!-- Opacity at which the background for the shutdown UI will be drawn. -->

    <item name="shutdown_scrim_behind_alpha" format="float" type="dimen">0.95</item>

</resources>

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

+3 −3
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ import dagger.Lazy; 


public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks {



    private static final float SHUTDOWN_SCRIM_ALPHA = 0.95f;



    private final Context mContext;

    private final Lazy<GlobalActionsDialog> mGlobalActionsDialogLazy;

    private final KeyguardStateController mKeyguardStateController;
@@ -153,7 +151,9 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
            mBlurUtils.applyBlur(d.getWindow().getDecorView().getViewRootImpl(),

                        mBlurUtils.blurRadiusOfRatio(1));

        } else {

            background.setAlpha((int) (SHUTDOWN_SCRIM_ALPHA * 255));

            float backgroundAlpha = mContext.getResources().getFloat(

                    com.android.systemui.R.dimen.shutdown_scrim_behind_alpha);

            background.setAlpha((int) (backgroundAlpha * 255));

        }



        d.show();