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

Commit fe413157 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

Merge "Fixes context for tiles without longClick" 

am: fc406201

Change-Id: Iae92b356edab987ba8f438a756bc548c8d3bdbda
parents a366edd7 fc406201

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java

+4 −1
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ public interface QSTile { 
        public boolean isTransient = false;

        public String expandedAccessibilityClassName;

        public SlashState slash;

        public boolean handlesLongClick = true;



        public boolean copyTo(State other) {

            if (other == null) throw new IllegalArgumentException();
@@ -133,7 +134,8 @@ public interface QSTile { 
                    || !Objects.equals(other.state, state)

                    || !Objects.equals(other.isTransient, isTransient)

                    || !Objects.equals(other.dualTarget, dualTarget)

                    || !Objects.equals(other.slash, slash);

                    || !Objects.equals(other.slash, slash)

                    || !Objects.equals(other.handlesLongClick, handlesLongClick);

            other.icon = icon;

            other.iconSupplier = iconSupplier;

            other.label = label;
@@ -146,6 +148,7 @@ public interface QSTile { 
            other.dualTarget = dualTarget;

            other.isTransient = isTransient;

            other.slash = slash != null ? slash.copy() : null;

            other.handlesLongClick = handlesLongClick;

            return changed;

        }

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java

+9 −4
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { 


        setClickable(state.state != Tile.STATE_UNAVAILABLE);

        mIcon.setIcon(state);

        setLongClickable(state.handlesLongClick);

        setContentDescription(state.contentDescription);



        mAccessibilityClass = state.expandedAccessibilityClassName;
@@ -276,10 +277,14 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { 
                info.setText(label);

                info.setChecked(b);

                info.setCheckable(true);

                if (isLongClickable()) {

                    info.addAction(

                            new AccessibilityNodeInfo.AccessibilityAction(

                                AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK.getId(),

                                getResources().getString(R.string.accessibility_long_click_tile)));

                                    AccessibilityNodeInfo.AccessibilityAction

                                            .ACTION_LONG_CLICK.getId(),

                                    getResources().getString(

                                            R.string.accessibility_long_click_tile)));

                }

            }

        }

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.qs.tiles; 


import android.app.ActivityManager;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.provider.MediaStore;

import android.service.quicksettings.Tile;

import android.widget.Switch;
@@ -50,7 +49,9 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements 


    @Override

    public BooleanState newTileState() {

        return new BooleanState();

        BooleanState state = new BooleanState();

        state.handlesLongClick = false;

        return state;

    }



    @Override