resolve merge conflicts of b0c58aa to master

Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b

src/com/android/settings/SettingsActivity.java

@@ -103,6 +103,7 @@ import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.notification.ZenModeVisualInterruptionSettings;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.search.DynamicIndexableContentMonitor;
@@ -682,6 +683,9 @@ 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");
     }

src/com/android/settings/overlay/FeatureFactoryImpl.java

@@ -25,5 +25,4 @@ public final class FeatureFactoryImpl extends FeatureFactory {
     public SupportFeatureProvider getSupportFeatureProvider() {
         return null;
     }
-
 }

src/com/android/settings/overlay/ToastController.java

@@ -0,0 +1,10 @@
+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);
+}