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

Commit a5697ece authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Lockscreen quick affordance buttons are bigger now." into tm-qpr-dev am: facfc015 

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



Change-Id: I2271a9009a8389eedee10aa8ccc50a3e5095aa4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2850dd6b facfc015

packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml

+9 −54
Original line number Diff line number Diff line
@@ -16,58 +16,13 @@ 
* limitations under the License.

*/

-->

<selector

<shape

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

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



  <item android:state_selected="true">

    <layer-list>

      <item

          android:left="3dp"

          android:top="3dp"

          android:right="3dp"

          android:bottom="3dp">

        <!-- We make the shapes a rounded rectangle instead of an oval so that it can animate -->

        <!-- properly into an app/dialog. -->

        <shape android:shape="rectangle">

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

    android:shape="rectangle">

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

  <size

      android:width="@dimen/keyguard_affordance_fixed_width"

      android:height="@dimen/keyguard_affordance_fixed_height"/>

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

</shape>
 
      </item>



      <item>

        <shape android:shape="rectangle">

          <stroke

              android:color="@color/control_primary_text"

              android:width="2dp"/>

          <size

              android:width="@dimen/keyguard_affordance_fixed_width"

              android:height="@dimen/keyguard_affordance_fixed_height"/>

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

        </shape>

      </item>

    </layer-list>

  </item>



  <item>

    <layer-list>

      <item

          android:left="3dp"

          android:top="3dp"

          android:right="3dp"

          android:bottom="3dp">

        <shape android:shape="rectangle">

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

          <size

              android:width="@dimen/keyguard_affordance_fixed_width"

              android:height="@dimen/keyguard_affordance_fixed_height"/>

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

        </shape>

      </item>

    </layer-list>

  </item>



</selector>

packages/SystemUI/res/drawable/keyguard_bottom_affordance_selected_border.xml

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

<!--

/*

* Copyright 2023, 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.

*/

-->

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



  <item android:state_selected="true">

    <shape android:shape="oval">

      <stroke

          android:color="@color/control_primary_text"

          android:width="2dp"/>

      <size

          android:width="@dimen/keyguard_affordance_fixed_width"

          android:height="@dimen/keyguard_affordance_fixed_height"/>

    </shape>

  </item>

</selector>

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
        android:scaleType="center"

        android:tint="?android:attr/textColorPrimary"

        android:background="@drawable/keyguard_bottom_affordance_bg"

        android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

        android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset"

        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:visibility="gone" />
@@ -79,6 +80,7 @@ 
        android:scaleType="center"

        android:tint="?android:attr/textColorPrimary"

        android:background="@drawable/keyguard_bottom_affordance_bg"

        android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

        android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset"

        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:visibility="gone" />