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

Commit d84e5937 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

fix press feedback on notification rows 

Change-Id: I50de2f4d6142c2553428abc853c820f4354d0640
Bug: 6362246
parent e17fc7d6

core/java/com/android/internal/widget/SizeAdaptiveLayout.java

+11 −2
Original line number Diff line number Diff line
@@ -26,8 +26,11 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.StateListDrawable;

import android.util.AttributeSet;

import android.util.Log;

import android.util.StateSet;

import android.view.View;

import android.view.ViewDebug;

import android.view.ViewGroup;
@@ -90,8 +93,14 @@ public class SizeAdaptiveLayout extends ViewGroup { 
    private void initialize() {

        mModestyPanel = new View(getContext());

        // If the SizeAdaptiveLayout has a solid background, use it as a transition hint.

        if (getBackground() instanceof ColorDrawable) {

            mModestyPanel.setBackgroundDrawable(getBackground());

        Drawable background = getBackground();

        if (background instanceof StateListDrawable) {

            StateListDrawable sld = (StateListDrawable) background;

            sld.setState(StateSet.WILD_CARD);

            background = sld.getCurrent();

        }

        if (background instanceof ColorDrawable) {

            mModestyPanel.setBackgroundDrawable(background);

        } else {

            mModestyPanel.setBackgroundColor(Color.BLACK);

        }

core/res/res/layout/notification_template_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

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

    android:background="@android:color/background_dark"

    android:background="@android:drawable/notification_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="64dp"

core/res/res/layout/notification_template_big_picture.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

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

    android:background="@android:color/background_dark"

    android:background="@android:drawable/notification_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

core/res/res/layout/notification_template_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

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

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

    android:background="@android:color/background_dark"

    android:background="@android:drawable/notification_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"