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

Commit 31d18e5b authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Implemented new Focus states for notifications row" into main

parents d08a4f37 1742bc0f
Loading
Loading
Loading
Loading
+22 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2024 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"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
    <item android:state_focused="true" android:color="?androidprv:attr/materialColorSecondary" />
    <item android:color="@color/transparent" />
</selector>
 No newline at end of file
+5 −0
Original line number Original line Diff line number Diff line
@@ -28,4 +28,9 @@
            <solid android:color="@color/notification_state_color_default" />
            <solid android:color="@color/notification_state_color_default" />
        </shape>
        </shape>
    </item>
    </item>
    <item>
        <shape>
            <stroke android:width="3dp" android:color="@color/notification_focus_overlay_color"/>
        </shape>
    </item>
</layer-list>
</layer-list>
 No newline at end of file
+2 −0
Original line number Original line Diff line number Diff line
@@ -2069,6 +2069,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
        // Remove views that don't translate
        // Remove views that don't translate
        mTranslateableViews.remove(mChildrenContainerStub);
        mTranslateableViews.remove(mChildrenContainerStub);
        mTranslateableViews.remove(mGutsStub);
        mTranslateableViews.remove(mGutsStub);
        // We don't handle focus highlight in this view, it's done in background drawable instead
        setDefaultFocusHighlightEnabled(false);
    }
    }


    /**
    /**