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

Commit 12d1f099 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 06044fe1: Merge "AccessibilityServiceInfo does not report properly the... 

am 06044fe1: Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0

* commit '06044fe1':
  AccessibilityServiceInfo does not report properly the feedback type.
parents 22522289 06044fe1

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+27 −13
Original line number Diff line number Diff line
@@ -463,20 +463,34 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * @return The string representation.

     */

    public static String feedbackTypeToString(int feedbackType) {

        switch (feedbackType) {

        StringBuilder builder = new StringBuilder();

        builder.append("[");

        while (feedbackType > 0) {

            final int feedbackTypeFlag = 1 << Integer.numberOfTrailingZeros(feedbackType);

            feedbackType &= ~feedbackTypeFlag;

            if (builder.length() > 1) {

                builder.append(", ");

            }

            switch (feedbackTypeFlag) {

                case FEEDBACK_AUDIBLE:

                return "FEEDBACK_AUDIBLE";

                    builder.append("FEEDBACK_AUDIBLE");

                    break;

                case FEEDBACK_HAPTIC:

                return "FEEDBACK_HAPTIC";

                    builder.append("FEEDBACK_HAPTIC");

                    break;

                case FEEDBACK_GENERIC:

                return "FEEDBACK_GENERIC";

                    builder.append("FEEDBACK_GENERIC");

                    break;

                case FEEDBACK_SPOKEN:

                return "FEEDBACK_SPOKEN";

                    builder.append("FEEDBACK_SPOKEN");

                    break;

                case FEEDBACK_VISUAL:

                return "FEEDBACK_VISUAL";

            default:

                return null;

                    builder.append("FEEDBACK_VISUAL");

                    break;

            }

        }

        builder.append("]");

        return builder.toString();

    }



    /**