From 1d1a2694e93f5b9d8c6fe01a3be8737ae0034736 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Thu, 14 Apr 2016 15:11:33 -0700
Subject: [PATCH] Remove ToastController.

Wasn't meant to be submitted.

Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit 17047d19396b9c01dd7d3daf92ef327f1eafc650)
---
 src/com/android/settings/SettingsActivity.java           |  3 ---
 src/com/android/settings/overlay/FeatureFactory.java     |  8 +-------
 src/com/android/settings/overlay/FeatureFactoryImpl.java | 12 ------------
 src/com/android/settings/overlay/ToastController.java    | 10 ----------
 4 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 src/com/android/settings/overlay/ToastController.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 066e26e872..176ab7ebd6 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -682,9 +682,6 @@ public class SettingsActivity extends SettingsDrawerActivity
             }
         }
 
-        // Will remove this line before submitting.
-        FeatureFactory.getFactory(this).createToastController().makeToast(this);
-
         if (DEBUG_TIMING) Log.d(LOG_TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
                 + " ms");
     }
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index a5e779d354..b0b2a3f48e 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -59,13 +59,7 @@ public abstract class FeatureFactory {
         return sFactory;
     }
 
-    /**
-     * Creates stub controller that makes {@link android.widget.Toast}s.
-     * Will be removed before submitting.
-     */
-    public abstract ToastController createToastController();
-
-    public static class FactoryNotFoundException extends RuntimeException {
+    public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
         }
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 4220bc015e..036b4e7075 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -16,20 +16,8 @@
 
 package com.android.settings.overlay;
 
-import android.content.Context;
-import android.widget.Toast;
-
 /**
  * {@link FeatureFactory} implementation for AOSP Settings.
  */
 public class FeatureFactoryImpl extends FeatureFactory {
-    @Override
-    public ToastController createToastController() {
-        return new ToastController() {
-            @Override
-            public void makeToast(Context context) {
-                Toast.makeText(context, "Here's a piece of AOSP toast", Toast.LENGTH_LONG).show();
-            }
-        };
-    }
 }
diff --git a/src/com/android/settings/overlay/ToastController.java b/src/com/android/settings/overlay/ToastController.java
deleted file mode 100644
index d009ce2c3d..0000000000
--- a/src/com/android/settings/overlay/ToastController.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.android.settings.overlay;
-
-import android.content.Context;
-
-/**
- * Will be removed before submitting. Just a proof of concept for review.
- */
-public interface ToastController {
-    void makeToast(Context context);
-}
-- 
2.11.0