Toast icon switch [1/2]

neobuddy89: Enabled by default

Change-Id: I59ffd10f20a2ae9491f76380ec9af641e0844928
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

Author: LorDClockaN

core/java/android/provider/Settings.java

@@ -6276,6 +6276,12 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          */
         public static final String STOCK_STATUSBAR_IN_HIDE = "stock_statusbar_in_hide";
 
+        /**
+         * Toast icon
+         * @hide
+         */
+        public static final String TOAST_ICON = "toast_icon";
+
         /**
          * Keys we no longer back up under the current schema, but want to continue to
          * process when restoring historical backup datasets.

core/java/android/widget/Toast.java

@@ -42,6 +42,7 @@
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -500,15 +501,17 @@ public static Toast makeText(@NonNull Context context, @Nullable Looper looper,
             Toast result = new Toast(context, looper);
             View v = ToastPresenter.getTextToastView(context, text);
             ImageView appIcon = (ImageView) v.findViewById(android.R.id.icon);
-            if (appIcon != null) {
-                PackageManager pm = context.getPackageManager();
-                Drawable icon = null;
-                try {
-                    icon = pm.getApplicationIcon(context.getPackageName());
-                } catch (PackageManager.NameNotFoundException e) {
-                    // nothing to do
+            if ((Settings.System.getInt(context.getContentResolver(), Settings.System.TOAST_ICON, 1) == 1)) {
+                if (appIcon != null) {
+                    PackageManager pm = context.getPackageManager();
+                    Drawable icon = null;
+                    try {
+                        icon = pm.getApplicationIcon(context.getPackageName());
+                    } catch (PackageManager.NameNotFoundException e) {
+                        // nothing to do
+                    }
+                    appIcon.setImageDrawable(icon);
                 }
-                appIcon.setImageDrawable(icon);
             }
             result.mNextView = v;
             result.mDuration = duration;