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

Commit 6e64423c authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix settings icon row consuming the click when tapping the notification" into nyc-dev

parents a0021cbb f153f5fc

packages/SystemUI/res/layout/notification_settings_icon_row.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:visibility="invisible"

    >



    <com.android.systemui.statusbar.AlphaOptimizedImageView
@@ -31,7 +32,6 @@ 
        android:paddingBottom="@dimen/notification_gear_padding"

        android:src="@drawable/ic_settings"

        android:tint="@color/notification_gear_color"

        android:visibility="invisible"

        android:alpha="0"

        android:background="?android:attr/selectableItemBackgroundBorderless"

        />

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

+2 −2
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC 
    private void setGearAlpha(float alpha) {

        if (alpha == 0) {

            mSettingsFadedIn = false; // Can fade in again once it's gone.

            mGearIcon.setVisibility(View.INVISIBLE);

            setVisibility(View.INVISIBLE);

        } else {

            if (alpha == 1) {

                mSettingsFadedIn = true;

            }

            mGearIcon.setVisibility(View.VISIBLE);

            setVisibility(View.VISIBLE);

        }

        mGearIcon.setAlpha(alpha);

    }