PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up some unnecessary inheritance.

Browse Source 
Bug: 30681529
Change-Id: I84fa1085cc18b167d506dec3b3054d9f74d3d3e7
This commit is contained in:
Fan Zhang
2016-08-16 14:53:48 -07:00
parent 56ff1fb0a2
commit 10ad09b658
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DialogCreatable.java
View File

@@ -25,5 +25,5 @@ import android.app.Dialog;
*/ */
public interface DialogCreatable { public interface DialogCreatable {
public Dialog onCreateDialog(int dialogId); Dialog onCreateDialog(int dialogId);
} }

4
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -26,7 +26,6 @@ import android.content.res.Resources;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.provider.Settings; 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.logging.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy; import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.DialogCreatable;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -66,7 +64,7 @@ import java.util.Set;
/** /**
* Activity with the accessibility settings. * Activity with the accessibility settings.
*/ */
public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable, public class AccessibilitySettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener, Indexable { Preference.OnPreferenceChangeListener, Indexable {
// Preference categories // Preference categories

5
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
View File

@@ -18,8 +18,6 @@ package com.android.settings.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
@@ -28,7 +26,6 @@ import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.DialogCreatable;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
@@ -38,7 +35,7 @@ import java.util.List;
* Activity with the accessibility settings specific to Setup Wizard. * Activity with the accessibility settings specific to Setup Wizard.
*/ */
public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment
implements DialogCreatable, Preference.OnPreferenceChangeListener { implements Preference.OnPreferenceChangeListener {
private static final String TAG = AccessibilitySettingsForSetupWizard.class.getSimpleName(); private static final String TAG = AccessibilitySettingsForSetupWizard.class.getSimpleName();

5
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -51,13 +51,12 @@ import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.DialogCreatable;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.utils.ProfileSettingsPreferenceFragment;
import com.android.settings.dashboard.SummaryLoader; import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw; import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.utils.ProfileSettingsPreferenceFragment;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@@ -67,7 +66,7 @@ import java.util.List;
* Fragment with the top level print settings. * Fragment with the top level print settings.
*/ */
public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
implements DialogCreatable, Indexable, OnClickListener { implements Indexable, OnClickListener {
public static final String TAG = "PrintSettingsFragment"; public static final String TAG = "PrintSettingsFragment";
private static final int LOADER_ID_PRINT_JOBS_LOADER = 1; private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
private static final int LOADER_ID_PRINT_SERVICES = 2; private static final int LOADER_ID_PRINT_SERVICES = 2;