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

Commit 44b780b1 authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-25525123-bouncer-pin-outline-PCTXNEVQZT" into main 

* changes:
  Revert "Make keyguard message not focusable."
  Revert "Restore default focus to input."
  Revert "Update bouncer input focused state to show outline inste..."
parents 03e306f0 d7353721

packages/SystemUI/res-keyguard/drawable/bouncer_password_text_view_focused_background.xml

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

<!-- Copyright (C) 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_focused="true">

        <shape android:shape="rectangle">

            <corners android:radius="16dp" />

            <stroke android:width="3dp"

                android:color="@color/bouncer_password_focus_color" />

        </shape>

    </item>

</selector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/layout/keyguard_bouncer_message_area.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:layout_marginTop="@dimen/keyguard_lock_padding"

        android:importantForAccessibility="no"

        android:ellipsize="marquee"

        android:focusable="false"

        android:focusable="true"

        android:gravity="center"

        android:singleLine="true" />

</merge>

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

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 
    </style>

    <style name="Widget.TextView.Password" parent="@android:style/Widget.TextView">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:background">@drawable/bouncer_password_text_view_focused_background</item>

        <item name="android:gravity">center</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>

packages/SystemUI/res/values-night/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ 
    <color name="qs_user_switcher_selected_avatar_icon_color">#202124</color>

    <!-- Color of background circle of user avatars in quick settings user switcher -->

    <color name="qs_user_switcher_avatar_background">#3C4043</color>

    <!-- Color of border for keyguard password input when focused -->

    <color name="bouncer_password_focus_color">@*android:color/system_secondary_dark</color>





    <!-- Accessibility floating menu -->

    <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->

packages/SystemUI/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ 
    <color name="kg_user_switcher_restricted_avatar_icon_color">@color/GM2_grey_600</color>

    <!-- Color of background circle of user avatars in keyguard user switcher -->

    <color name="user_avatar_color_bg">?android:attr/colorBackgroundFloating</color>

    <!-- Color of border for keyguard password input when focused -->

    <color name="bouncer_password_focus_color">@*android:color/system_secondary_light</color>



    <!-- Icon color for user avatars in user switcher quick settings -->

    <color name="qs_user_switcher_avatar_icon_color">#3C4043</color>