diff options
6 files changed, 29 insertions, 26 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index 301ab2bcdd65..8f6c4e743269 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -1429,7 +1429,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi void makeOverlayToast(int stringId) { final Resources res = mContext.getResources(); - final SystemUIToast systemUIToast = mToastFactory.createToast(mContext, + final SystemUIToast systemUIToast = mToastFactory.createToast(mContext, mContext, res.getString(stringId), mContext.getPackageName(), UserHandle.myUserId(), res.getConfiguration().orientation); if (systemUIToast == null) { diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/ui/BrightnessWarningToast.kt b/packages/SystemUI/src/com/android/systemui/settings/brightness/ui/BrightnessWarningToast.kt index dfbdaa62ec44..9dc2cbad3c72 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/ui/BrightnessWarningToast.kt +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/ui/BrightnessWarningToast.kt @@ -41,7 +41,7 @@ constructor( // Show the brightness warning toast with passing the toast inflation required context, // userId and resId from SystemUI package. val systemUIToast = toastFactory.createToast( - viewContext, + viewContext, viewContext, res.getString(resId), viewContext.packageName, viewContext.getUserId(), res.configuration.orientation ) diff --git a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java index d97cae2a99e3..d367455d26c7 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java +++ b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java @@ -50,6 +50,7 @@ import com.android.systemui.plugins.ToastPlugin; public class SystemUIToast implements ToastPlugin.Toast { static final String TAG = "SystemUIToast"; final Context mContext; + final Context mDisplayContext; final CharSequence mText; final ToastPlugin.Toast mPluginToast; @@ -68,17 +69,18 @@ public class SystemUIToast implements ToastPlugin.Toast { @Nullable private final Animator mInAnimator; @Nullable private final Animator mOutAnimator; - SystemUIToast(LayoutInflater layoutInflater, Context context, CharSequence text, - String packageName, int userId, int orientation) { - this(layoutInflater, context, text, null, packageName, userId, + SystemUIToast(LayoutInflater layoutInflater, Context applicationContext, Context displayContext, + CharSequence text, String packageName, int userId, int orientation) { + this(layoutInflater, applicationContext, displayContext, text, null, packageName, userId, orientation); } - SystemUIToast(LayoutInflater layoutInflater, Context context, CharSequence text, - ToastPlugin.Toast pluginToast, String packageName, @UserIdInt int userId, - int orientation) { + SystemUIToast(LayoutInflater layoutInflater, Context applicationContext, Context displayContext, + CharSequence text, ToastPlugin.Toast pluginToast, String packageName, + @UserIdInt int userId, int orientation) { mLayoutInflater = layoutInflater; - mContext = context; + mContext = applicationContext; + mDisplayContext = displayContext; mText = text; mPluginToast = pluginToast; mPackageName = packageName; @@ -221,9 +223,9 @@ public class SystemUIToast implements ToastPlugin.Toast { mPluginToast.onOrientationChange(orientation); } - mDefaultY = mContext.getResources().getDimensionPixelSize(R.dimen.toast_y_offset); + mDefaultY = mDisplayContext.getResources().getDimensionPixelSize(R.dimen.toast_y_offset); mDefaultGravity = - mContext.getResources().getInteger(R.integer.config_toastDefaultGravity); + mDisplayContext.getResources().getInteger(R.integer.config_toastDefaultGravity); } private Animator createInAnimator() { diff --git a/packages/SystemUI/src/com/android/systemui/toast/ToastFactory.java b/packages/SystemUI/src/com/android/systemui/toast/ToastFactory.java index 9ae66749aa0a..388d4bd6780b 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/ToastFactory.java +++ b/packages/SystemUI/src/com/android/systemui/toast/ToastFactory.java @@ -65,15 +65,16 @@ public class ToastFactory implements Dumpable { /** * Create a toast to be shown by ToastUI. */ - public SystemUIToast createToast(Context context, CharSequence text, String packageName, - int userId, int orientation) { - LayoutInflater layoutInflater = LayoutInflater.from(context); + public SystemUIToast createToast(Context applicationContext, Context displayContext, + CharSequence text, String packageName, int userId, int orientation) { + LayoutInflater layoutInflater = LayoutInflater.from(displayContext); if (isPluginAvailable()) { - return new SystemUIToast(layoutInflater, context, text, mPlugin.createToast(text, - packageName, userId), packageName, userId, orientation); + return new SystemUIToast(layoutInflater, applicationContext, displayContext, text, + mPlugin.createToast(text, packageName, userId), packageName, userId, + orientation); } - return new SystemUIToast(layoutInflater, context, text, packageName, userId, - orientation); + return new SystemUIToast(layoutInflater, applicationContext, displayContext, text, + packageName, userId, orientation); } private boolean isPluginAvailable() { diff --git a/packages/SystemUI/src/com/android/systemui/toast/ToastUI.java b/packages/SystemUI/src/com/android/systemui/toast/ToastUI.java index 32a4f12777ac..12f73b8a887d 100644 --- a/packages/SystemUI/src/com/android/systemui/toast/ToastUI.java +++ b/packages/SystemUI/src/com/android/systemui/toast/ToastUI.java @@ -135,8 +135,8 @@ public class ToastUI implements return; } Context displayContext = context.createDisplayContext(display); - mToast = mToastFactory.createToast(displayContext /* sysuiContext */, text, packageName, - userHandle.getIdentifier(), mOrientation); + mToast = mToastFactory.createToast(mContext, displayContext /* sysuiContext */, text, + packageName, userHandle.getIdentifier(), mOrientation); if (mToast.getInAnimation() != null) { mToast.getInAnimation().start(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java index 0b9c06f2dbe2..5ada2f3fd63d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java @@ -222,7 +222,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { when(SubscriptionManager.getDefaultDataSubscriptionId()).thenReturn(SUB_ID); SubscriptionInfo info = mock(SubscriptionInfo.class); when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(info); - when(mToastFactory.createToast(any(), anyString(), anyString(), anyInt(), anyInt())) + when(mToastFactory.createToast(any(), any(), anyString(), anyString(), anyInt(), anyInt())) .thenReturn(mSystemUIToast); when(mSystemUIToast.getView()).thenReturn(mToastView); when(mSystemUIToast.getGravity()).thenReturn(GRAVITY_FLAGS); @@ -275,8 +275,8 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { mInternetDialogController.connectCarrierNetwork(); verify(mMergedCarrierEntry).connect(null /* callback */, false /* showToast */); - verify(mToastFactory).createToast(any(), eq(TOAST_MESSAGE_STRING), anyString(), anyInt(), - anyInt()); + verify(mToastFactory).createToast(any(), any(), eq(TOAST_MESSAGE_STRING), anyString(), + anyInt(), anyInt()); } @Test @@ -288,7 +288,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { mInternetDialogController.connectCarrierNetwork(); verify(mMergedCarrierEntry, never()).connect(null /* callback */, false /* showToast */); - verify(mToastFactory, never()).createToast(any(), anyString(), anyString(), anyInt(), + verify(mToastFactory, never()).createToast(any(), any(), anyString(), anyString(), anyInt(), anyInt()); } @@ -302,7 +302,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { mInternetDialogController.connectCarrierNetwork(); verify(mMergedCarrierEntry, never()).connect(null /* callback */, false /* showToast */); - verify(mToastFactory, never()).createToast(any(), anyString(), anyString(), anyInt(), + verify(mToastFactory, never()).createToast(any(), any(), anyString(), anyString(), anyInt(), anyInt()); } @@ -321,7 +321,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { mInternetDialogController.connectCarrierNetwork(); verify(mMergedCarrierEntry, never()).connect(null /* callback */, false /* showToast */); - verify(mToastFactory, never()).createToast(any(), anyString(), anyString(), anyInt(), + verify(mToastFactory, never()).createToast(any(), any(), anyString(), anyString(), anyInt(), anyInt()); } |