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

Commit 6ce3db49 authored by Dieter Hsu's avatar Dieter Hsu Committed by android-build-merger
Browse files

Merge "Trigger action for app ops icon for keyboard navigation" into pi-dev am: 7f91c59b 

am: a30db99a

Change-Id: I230703ca8de3ca0e7949f212cc2af1c95ffcc38c
parents db83c16e a30db99a

core/java/android/view/NotificationHeaderView.java

+3 −0
Original line number Diff line number Diff line
@@ -282,6 +282,9 @@ public class NotificationHeaderView extends ViewGroup { 
    public void setAppOpsOnClickListener(OnClickListener l) {

        mAppOpsListener = l;

        mAppOps.setOnClickListener(mAppOpsListener);

        mCameraIcon.setOnClickListener(mAppOpsListener);

        mMicIcon.setOnClickListener(mAppOpsListener);

        mOverlayIcon.setOnClickListener(mAppOpsListener);

        updateTouchListener();

    }

core/res/res/layout/notification_template_header.xml

+0 −3
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ 
            android:src="@drawable/ic_camera"

            android:background="?android:selectableItemBackgroundBorderless"

            android:visibility="gone"

            android:clickable="false"

            android:contentDescription="@string/notification_appops_camera_active"

            />

        <ImageButton
@@ -150,7 +149,6 @@ 
            android:background="?android:selectableItemBackgroundBorderless"

            android:layout_marginStart="4dp"

            android:visibility="gone"

            android:clickable="false"

            android:contentDescription="@string/notification_appops_microphone_active"

            />

        <ImageButton
@@ -161,7 +159,6 @@ 
            android:background="?android:selectableItemBackgroundBorderless"

            android:layout_marginStart="4dp"

            android:visibility="gone"

            android:clickable="false"

            android:contentDescription="@string/notification_appops_overlay_active"

            />

    </LinearLayout>