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

Commit a0457c2e authored by John Spurlock's avatar John Spurlock
Browse files

Touch-exploration improvements to volume dialog. 

 - Extend the dismiss timeout when interacting with various
   subcontrols.
 - Ensure "hover" events in touch exploration extend the timeout
   in addition to touch events.
 - Introduce new helper to standardize interaction callbacks.
 - Announce zen toasts.
 - Announce zen condition selections, and when existing countdown
   conditions are modified.

Bug:17578434
Change-Id: I8a055b3455aa8d20ba93439bdec6cc75db97800e
parent 759962ab

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -908,4 +908,7 @@ 


    <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->

    <string name="muted_by">Muted by <xliff:g id="third_party">%1$s</xliff:g></string>



    <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->

    <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>

</resources>

packages/SystemUI/src/com/android/systemui/volume/Interaction.java

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 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.

 */



package com.android.systemui.volume;



import android.view.MotionEvent;

import android.view.View;

import android.view.View.OnGenericMotionListener;

import android.view.View.OnTouchListener;



public class Interaction {



    public static void register(View v, final Callback callback) {

        v.setOnTouchListener(new OnTouchListener() {

            @Override

            public boolean onTouch(View v, MotionEvent event) {

                callback.onInteraction();

                return false;

            }

        });

        v.setOnGenericMotionListener(new OnGenericMotionListener() {

            @Override

            public boolean onGenericMotion(View v, MotionEvent event) {

                callback.onInteraction();

                return false;

            }

        });

    }



    public interface Callback {

        void onInteraction();

    }

}

packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java

+13 −1
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ public class SegmentedButtons extends LinearLayout { 
        addView(b);

        b.setTag(value);

        b.setOnClickListener(mClick);

        Interaction.register(b, new Interaction.Callback() {

            @Override

            public void onInteraction() {

                fireInteraction();

            }

        });

    }



    public void updateLocale() {
@@ -96,6 +102,12 @@ public class SegmentedButtons extends LinearLayout { 
        }

    }



    private void fireInteraction() {

        if (mCallback != null) {

            mCallback.onInteraction();

        }

    }



    private final View.OnClickListener mClick = new View.OnClickListener() {

        @Override

        public void onClick(View v) {
@@ -103,7 +115,7 @@ public class SegmentedButtons extends LinearLayout { 
        }

    };



    public interface Callback {

    public interface Callback extends Interaction.Callback {

        void onSelected(Object value);

    }

}

packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java

+7 −5
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.media.VolumeProvider; 
import android.media.session.MediaController;

import android.media.session.MediaController.PlaybackInfo;

import android.net.Uri;

import android.os.Debug;

import android.os.Handler;

import android.os.Message;

import android.os.Vibrator;
@@ -400,11 +401,10 @@ public class VolumePanel extends Handler { 
                | LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

                | LayoutParams.FLAG_HARDWARE_ACCELERATED);

        mView = window.findViewById(R.id.content);

        mView.setOnTouchListener(new View.OnTouchListener() {

        Interaction.register(mView, new Interaction.Callback() {

            @Override

            public boolean onTouch(View v, MotionEvent event) {

            public void onInteraction() {

                resetTimeout();

                return false;

            }

        });
@@ -1382,9 +1382,10 @@ public class VolumePanel extends Handler { 
    }



    private void resetTimeout() {

        final boolean touchExploration = mAccessibilityManager.isTouchExplorationEnabled();

        if (LOGD) Log.d(mTag, "resetTimeout at " + System.currentTimeMillis()

                + " delay=" + mTimeoutDelay);

        if (sSafetyWarning == null || !mAccessibilityManager.isTouchExplorationEnabled()) {

                + " delay=" + mTimeoutDelay + " touchExploration=" + touchExploration);

        if (sSafetyWarning == null || !touchExploration) {

            removeMessages(MSG_TIMEOUT);

            sendEmptyMessageDelayed(MSG_TIMEOUT, mTimeoutDelay);

            removeMessages(MSG_USER_ACTIVITY);
@@ -1393,6 +1394,7 @@ public class VolumePanel extends Handler { 
    }



    private void forceTimeout(long delay) {

        if (LOGD) Log.d(mTag, "forceTimeout delay=" + delay + " callers=" + Debug.getCallers(3));

        removeMessages(MSG_TIMEOUT);

        sendEmptyMessageDelayed(MSG_TIMEOUT, delay);

    }

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+52 −11
Original line number Diff line number Diff line
@@ -135,20 +135,21 @@ public class ZenModePanel extends LinearLayout { 
            @Override

            public void onClick(View v) {

                setExpanded(true);

                fireInteraction();

            }

        });

        Interaction.register(mZenSubheadCollapsed, mInteractionCallback);



        mZenSubheadExpanded = (TextView) findViewById(R.id.zen_subhead_expanded);

        Interaction.register(mZenSubheadExpanded, mInteractionCallback);



        mMoreSettings = findViewById(R.id.zen_more_settings);

        mMoreSettings.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                fireMoreSettings();

                fireInteraction();

            }

        });

        Interaction.register(mMoreSettings, mInteractionCallback);



        mZenConditions = (LinearLayout) findViewById(R.id.zen_conditions);

    }
@@ -444,18 +445,22 @@ public class ZenModePanel extends LinearLayout { 
                        childTag.rb.setChecked(false);

                    }

                    select(tag.condition);

                    fireInteraction();

                    announceConditionSelection(tag);

                }

            }

        });

        final TextView title = (TextView) row.findViewById(android.R.id.title);



        if (tag.title == null) {

            tag.title = (TextView) row.findViewById(android.R.id.title);

        }

        if (condition == null) {

            title.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));

            tag.title.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));

        } else {

            title.setText(condition.summary);

            tag.title.setText(condition.summary);

        }

        title.setEnabled(enabled);

        title.setAlpha(enabled ? 1 : .4f);

        tag.title.setEnabled(enabled);

        tag.title.setAlpha(enabled ? 1 : .4f);



        final ImageView button1 = (ImageView) row.findViewById(android.R.id.button1);

        button1.setOnClickListener(new OnClickListener() {

            @Override
@@ -471,11 +476,10 @@ public class ZenModePanel extends LinearLayout { 
                onClickTimeButton(row, tag, true /*up*/);

            }

        });

        title.setOnClickListener(new OnClickListener() {

        tag.title.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View v) {

                tag.rb.setChecked(true);

                fireInteraction();

            }

        });
@@ -497,6 +501,30 @@ public class ZenModePanel extends LinearLayout { 
            button1.setVisibility(View.GONE);

            button2.setVisibility(View.GONE);

        }

        // wire up interaction callbacks for newly-added condition rows

        if (convertView == null) {

            Interaction.register(tag.rb, mInteractionCallback);

            Interaction.register(tag.title, mInteractionCallback);

            Interaction.register(button1, mInteractionCallback);

            Interaction.register(button2, mInteractionCallback);

        }

    }



    private void announceConditionSelection(ConditionTag tag) {

        final int zen = getSelectedZen(Global.ZEN_MODE_OFF);

        String modeText;

        switch(zen) {

            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:

                modeText = mContext.getString(R.string.zen_important_interruptions);

                break;

            case Global.ZEN_MODE_NO_INTERRUPTIONS:

                modeText = mContext.getString(R.string.zen_no_interruptions);

                break;

             default:

                return;

        }

        announceForAccessibility(mContext.getString(R.string.zen_mode_and_condition, modeText,

                tag.title.getText()));

    }



    private void onClickTimeButton(View row, ConditionTag tag, boolean up) {
@@ -530,7 +558,7 @@ public class ZenModePanel extends LinearLayout { 
        bind(mTimeCondition, row);

        tag.rb.setChecked(true);

        select(mTimeCondition);

        fireInteraction();

        announceConditionSelection(tag);

    }



    private void select(Condition condition) {
@@ -611,6 +639,7 @@ public class ZenModePanel extends LinearLayout { 
    // used as the view tag on condition rows

    private static class ConditionTag {

        RadioButton rb;

        TextView title;

        Condition condition;

    }
@@ -691,5 +720,17 @@ public class ZenModePanel extends LinearLayout { 
                mController.setZen((Integer) value);

            }

        }



        @Override

        public void onInteraction() {

            fireInteraction();

        }

    };



    private final Interaction.Callback mInteractionCallback = new Interaction.Callback() {

        @Override

        public void onInteraction() {

            fireInteraction();

        }

    };

}