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

Commit 2f23daa7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add logout button style" into sc-qpr1-dev am: fc9b5bac 

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

Change-Id: I0e5776d85075e88b21e0140155d0ae54145774ca
parents c1576dc9 fc9b5bac

packages/SystemUI/res-keyguard/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -146,4 +146,8 @@ 
        <item name="android:shadowColor">@color/keyguard_shadow_color</item>

        <item name="android:shadowRadius">?attr/shadowRadius</item>

    </style>



    <style name="TextAppearance.Keyguard.BottomArea.Button">

        <item name="android:shadowRadius">0</item>

    </style>

</resources>

packages/SystemUI/res/drawable/logout_button_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <solid android:color="@color/logout_button_bg_color"/>

    <solid android:color="?androidprv:attr/colorAccentPrimary"/>

    <corners android:radius="@dimen/logout_button_corner_radius"/>

</shape>

packages/SystemUI/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -192,9 +192,6 @@ 
    <color name="udfps_enroll_progress">#ff669DF6</color>                   <!-- blue 400 -->

    <color name="udfps_enroll_progress_help">#ffEE675C</color>              <!-- red 400 -->



    <!-- Logout button -->

    <color name="logout_button_bg_color">#ccffffff</color>



    <!-- Color for the Assistant invocation lights -->

    <color name="default_invocation_lights_color">#ffffffff</color>         <!-- white -->

packages/SystemUI/res/values/dimens.xml

+1 −4
Original line number Diff line number Diff line
@@ -1250,10 +1250,7 @@ 
    <integer name="wired_charging_keyguard_text_animation_distance">-30</integer>



    <!-- Logout button -->

    <dimen name="logout_button_layout_height">32dp</dimen>

    <dimen name="logout_button_padding_horizontal">16dp</dimen>

    <dimen name="logout_button_margin_bottom">12dp</dimen>

    <dimen name="logout_button_corner_radius">4dp</dimen>

    <dimen name="logout_button_corner_radius">50dp</dimen>



    <!--  Blur radius on status bar window and power menu  -->

    <dimen name="min_window_blur_radius">1px</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+3 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.internal.widget.ViewClippingUtil;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.settingslib.Utils;

import com.android.settingslib.fuelgauge.BatteryStatus;

import com.android.systemui.R;

import com.android.systemui.animation.Interpolators;
@@ -455,7 +456,8 @@ public class KeyguardIndicationController { 
                    new KeyguardIndication.Builder()

                            .setMessage(mContext.getResources().getString(

                                    com.android.internal.R.string.global_action_logout))

                            .setTextColor(mInitialTextColorState)

                            .setTextColor(Utils.getColorAttr(

                                    mContext, com.android.internal.R.attr.textColorOnAccent))

                            .setBackground(mContext.getDrawable(

                                    com.android.systemui.R.drawable.logout_button_background))

                            .setClickListener((view) -> {