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

Commit fba3bf97 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Improve Toast RTL support" into jb-mr1-dev

parents 16ef5779 025f9602
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package android.widget;
import android.app.INotificationManager;
import android.app.ITransientNotification;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.os.Handler;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.LocaleUtil;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -34,8 +34,6 @@ import android.view.WindowManagerImpl;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;

import java.util.Locale;

/**
 * A toast is a view containing a quick little message for the user.  The toast class
 * helps you create and show those.
@@ -376,9 +374,8 @@ public class Toast {
                mWM = WindowManagerImpl.getDefault();
                // We can resolve the Gravity here by using the Locale for getting
                // the layout direction
                final Locale locale = mView.getContext().getResources().getConfiguration().locale;
                final int layoutDirection = LocaleUtil.getLayoutDirectionFromLocale(locale);
                final int gravity = Gravity.getAbsoluteGravity(mGravity, layoutDirection);
                final Configuration config = mView.getContext().getResources().getConfiguration();
                final int gravity = Gravity.getAbsoluteGravity(mGravity, config.layoutDirection);
                mParams.gravity = gravity;
                if ((gravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.FILL_HORIZONTAL) {
                    mParams.horizontalWeight = 1.0f;