From 10ad09b65824aa44a8cd1e541bb57f67190325a3 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 16 Aug 2016 14:53:48 -0700
Subject: [PATCH] Clean up some unnecessary inheritance.

Bug: 30681529
Change-Id: I84fa1085cc18b167d506dec3b3054d9f74d3d3e7
---
 src/com/android/settings/DialogCreatable.java                | 2 +-
 .../settings/accessibility/AccessibilitySettings.java        | 4 +---
 .../accessibility/AccessibilitySettingsForSetupWizard.java   | 5 +----
 src/com/android/settings/print/PrintSettingsFragment.java    | 5 ++---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/com/android/settings/DialogCreatable.java b/src/com/android/settings/DialogCreatable.java
index 1d10be7f880..a0de2e03bff 100644
--- a/src/com/android/settings/DialogCreatable.java
+++ b/src/com/android/settings/DialogCreatable.java
@@ -25,5 +25,5 @@ import android.app.Dialog;
  */
 public interface DialogCreatable {
 
-    public Dialog onCreateDialog(int dialogId);
+    Dialog onCreateDialog(int dialogId);
 }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 62671fa30e8..c2c75190a97 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -26,7 +26,6 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.RemoteException;
 import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
@@ -44,7 +43,6 @@ import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.view.RotationPolicy;
 import com.android.internal.view.RotationPolicy.RotationPolicyListener;
-import com.android.settings.DialogCreatable;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -66,7 +64,7 @@ import java.util.Set;
 /**
  * Activity with the accessibility settings.
  */
-public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
+public class AccessibilitySettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener, Indexable {
 
     // Preference categories
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
index f21e467fedf..ce072578a24 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -18,8 +18,6 @@ package com.android.settings.accessibility;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -28,7 +26,6 @@ import android.text.TextUtils;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.DialogCreatable;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -38,7 +35,7 @@ import java.util.List;
  * Activity with the accessibility settings specific to Setup Wizard.
  */
 public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment
-        implements DialogCreatable, Preference.OnPreferenceChangeListener {
+        implements Preference.OnPreferenceChangeListener {
 
     private static final String TAG = AccessibilitySettingsForSetupWizard.class.getSimpleName();
 
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 49d254c41e1..98659c74c74 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -51,13 +51,12 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.DialogCreatable;
 import com.android.settings.R;
-import com.android.settings.utils.ProfileSettingsPreferenceFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.utils.ProfileSettingsPreferenceFragment;
 
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -67,7 +66,7 @@ import java.util.List;
  * Fragment with the top level print settings.
  */
 public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
-        implements DialogCreatable, Indexable, OnClickListener {
+        implements Indexable, OnClickListener {
     public static final String TAG = "PrintSettingsFragment";
     private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
     private static final int LOADER_ID_PRINT_SERVICES = 2;