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

Commit 4fd2dff4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use AccessibilityManager#getRecommendedTimeoutMillis for Snackbar" into ub-launcher3-qt-dev

parents 2a3c9364 5519a0f6

src/com/android/launcher3/compat/AccessibilityManagerCompat.java

+7 −0
Original line number Diff line number Diff line
@@ -106,4 +106,11 @@ public class AccessibilityManagerCompat { 
        }

        return false;

    }



    public static int getRecommendedTimeoutMillis(Context context, int originalTimeout, int flags) {

        if (Utilities.ATLEAST_Q) {

            return getManager(context).getRecommendedTimeoutMillis(originalTimeout, flags);

        }

        return originalTimeout;

    }

}

src/com/android/launcher3/views/Snackbar.java

+8 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.launcher3.views;



import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS;

import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_TEXT;



import android.content.Context;

import android.content.res.Resources;

import android.graphics.Rect;
@@ -29,6 +32,7 @@ import com.android.launcher3.AbstractFloatingView; 
import com.android.launcher3.Launcher;

import com.android.launcher3.R;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.dragndrop.DragLayer;



/**
@@ -38,7 +42,7 @@ public class Snackbar extends AbstractFloatingView { 


    private static final long SHOW_DURATION_MS = 180;

    private static final long HIDE_DURATION_MS = 180;

    private static final long TIMEOUT_DURATION_MS = 4000;

    private static final int TIMEOUT_DURATION_MS = 4000;



    private final Launcher mLauncher;

    private Runnable mOnDismissed;
@@ -131,7 +135,9 @@ public class Snackbar extends AbstractFloatingView { 
                .setDuration(SHOW_DURATION_MS)

                .setInterpolator(Interpolators.ACCEL_DEACCEL)

                .start();

        snackbar.postDelayed(() -> snackbar.close(true), TIMEOUT_DURATION_MS);

        int timeout = AccessibilityManagerCompat.getRecommendedTimeoutMillis(launcher,

                TIMEOUT_DURATION_MS, FLAG_CONTENT_TEXT | FLAG_CONTENT_CONTROLS);

        snackbar.postDelayed(() -> snackbar.close(true), timeout);

    }



    @Override