From 4cc915ad64ecb3666182960a361bc91222475dd3 Mon Sep 17 00:00:00 2001 From: josephpv Date: Fri, 15 Mar 2024 11:30:44 +0000 Subject: [PATCH] Change icon for Private Space unlocked and setup success toast Change is made to show customised icon in Toast message shown by using Toast.makeCustomToastWithIcon() Screenshots : go/ss/AcaRQUJQfh79wDw.png go/ss/5j4oD8xydwX7HTX.png Bug: 329391204 Bug: 309575523 Test: Manual Change-Id: I336d7d0419b1de60024e584e943a725662b446a9 --- res/drawable/ic_private_space_unlock_icon.xml | 25 +++++++++++++++++++ .../PrivateSpaceDashboardFragment.java | 10 +++++++- .../privatespace/SetupSuccessFragment.java | 12 +++++++-- .../PrivateSpaceDeletionProgressFragment.java | 15 +++++++++-- 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 res/drawable/ic_private_space_unlock_icon.xml diff --git a/res/drawable/ic_private_space_unlock_icon.xml b/res/drawable/ic_private_space_unlock_icon.xml new file mode 100644 index 00000000000..0ea94882381 --- /dev/null +++ b/res/drawable/ic_private_space_unlock_icon.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java index 32db8b6a7d3..f539a8b86c6 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java +++ b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java @@ -19,6 +19,7 @@ package com.android.settings.privatespace; import static com.android.settings.privatespace.PrivateSpaceAuthenticationActivity.EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED; import android.app.settings.SettingsEnums; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.util.Log; import android.widget.Toast; @@ -38,7 +39,14 @@ public class PrivateSpaceDashboardFragment extends DashboardFragment { if (icicle == null && getIntent().getBooleanExtra(EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED, false)) { Log.i(TAG, "Private space unlocked showing toast"); - Toast.makeText(getContext(), R.string.private_space_unlocked, Toast.LENGTH_SHORT) + Drawable drawable = + getContext().getDrawable(R.drawable.ic_private_space_unlock_icon); + Toast.makeCustomToastWithIcon( + getContext(), + null /* looper */, + getContext().getString(R.string.private_space_unlocked), + Toast.LENGTH_SHORT, + drawable) .show(); } } diff --git a/src/com/android/settings/privatespace/SetupSuccessFragment.java b/src/com/android/settings/privatespace/SetupSuccessFragment.java index cf63b22fead..c0a2cd4d87a 100644 --- a/src/com/android/settings/privatespace/SetupSuccessFragment.java +++ b/src/com/android/settings/privatespace/SetupSuccessFragment.java @@ -21,6 +21,7 @@ import android.app.settings.SettingsEnums; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -100,6 +101,7 @@ public class SetupSuccessFragment extends InstrumentedFragment { allAppsIntent.setPackage(resolveInfo.activityInfo.packageName); allAppsIntent.setComponent(resolveInfo.activityInfo.getComponentName()); } + activity.setTheme(R.style.Theme_SubSettings); accessPrivateSpaceToast(); startActivity(allAppsIntent); Log.i(TAG, "Private space setup complete"); @@ -109,7 +111,13 @@ public class SetupSuccessFragment extends InstrumentedFragment { } private void accessPrivateSpaceToast() { - Toast.makeText(getContext(), R.string.private_space_scrolldown_to_access, - Toast.LENGTH_SHORT).show(); + Drawable drawable = getContext().getDrawable(R.drawable.ic_private_space_icon); + Toast.makeCustomToastWithIcon( + getContext(), + null /* looper */ , + getContext().getString(R.string.private_space_scrolldown_to_access), + Toast.LENGTH_SHORT, + drawable) + .show(); } } diff --git a/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java b/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java index 33f0a3ee362..0893070536f 100644 --- a/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java +++ b/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java @@ -21,6 +21,7 @@ import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDele import android.app.settings.SettingsEnums; import android.content.Context; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -132,13 +133,23 @@ public class PrivateSpaceDeletionProgressFragment extends InstrumentedFragment { /** Shows a toast saying that the private space was deleted */ @VisibleForTesting public void showSuccessfulDeletionToast() { - Toast.makeText(getContext(), R.string.private_space_deleted, Toast.LENGTH_SHORT).show(); + showToastWithCustomIcon(R.string.private_space_deleted); } /** Shows a toast saying that the private space could not be deleted */ @VisibleForTesting public void showDeletionInternalErrorToast() { - Toast.makeText(getContext(), R.string.private_space_delete_failed, Toast.LENGTH_SHORT) + showToastWithCustomIcon(R.string.private_space_delete_failed); + } + + private void showToastWithCustomIcon(int stringRes) { + Drawable drawable = getContext().getDrawable(R.drawable.ic_private_space_icon); + Toast.makeCustomToastWithIcon( + getContext(), + null /* looper */ , + getContext().getString(stringRes), + Toast.LENGTH_SHORT, + drawable) .show(); } }