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

Commit f0503755 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Update toast to use a11y api for duration timeout."

parents 00eb6f10 406d3a2e

services/core/java/com/android/server/notification/NotificationManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -5511,7 +5511,12 @@ public class NotificationManagerService extends SystemService { 
    {

        mHandler.removeCallbacksAndMessages(r);

        Message m = Message.obtain(mHandler, MESSAGE_DURATION_REACHED, r);

        long delay = r.duration == Toast.LENGTH_LONG ? LONG_DELAY : SHORT_DELAY;

        int delay = r.duration == Toast.LENGTH_LONG ? LONG_DELAY : SHORT_DELAY;

        // Accessibility users may need longer timeout duration. This api compares original delay

        // with user's preference and return longer one. It returns original delay if there's no

        // preference.

        delay = mAccessibilityManager.getRecommendedTimeoutMillis(delay,

                AccessibilityManager.FLAG_CONTENT_TEXT);

        mHandler.sendMessageDelayed(m, delay);

    }

services/core/java/com/android/server/wm/DisplayPolicy.java

+6 −0
Original line number Diff line number Diff line
@@ -763,6 +763,12 @@ public class DisplayPolicy { 
                        || attrs.hideTimeoutMilliseconds > TOAST_WINDOW_TIMEOUT) {

                    attrs.hideTimeoutMilliseconds = TOAST_WINDOW_TIMEOUT;

                }

                // Accessibility users may need longer timeout duration. This api compares

                // original timeout with user's preference and return longer one. It returns

                // original timeout if there's no preference.

                attrs.hideTimeoutMilliseconds = mAccessibilityManager.getRecommendedTimeoutMillis(

                        (int) attrs.hideTimeoutMilliseconds,

                        AccessibilityManager.FLAG_CONTENT_TEXT);

                attrs.windowAnimations = com.android.internal.R.style.Animation_Toast;

                break;

        }