commit bf4be77f7ef1a6c6384331d69d490794705d0e3b
author Fan Zhang <zhfan@google.com> Thu Aug 04 16:05:55 2016 -0700
committer Fan Zhang <zhfan@google.com> Wed Aug 10 12:59:24 2016 -0700
tree 656f43d4b6b0fc1eb4a1de592db8338387cee69d
parent b9eeb53a8de23b5fb5d558a5edd8a2c1d7c2b948

Merge InstrumentedFragment & InstrumentedPerferenceFragment

Bug: 30642749

The 2 classes are almost identical so I'd like to just merge them if
there is no specific reason for keeping both.

Change-Id: I46af41388e25abf79066ff25bfb793cdef2e06ea

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index a8bd3092..a79045a 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -52,7 +52,7 @@
 /**
  * Base class for Settings fragments, with some helper functions and dialog management.
  */
-public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceFragment
+public abstract class SettingsPreferenceFragment extends InstrumentedFragment
         implements DialogCreatable {
 
     /**
@@ -133,10 +133,6 @@
     }
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-    }
-
-    @Override
     public void addPreferencesFromResource(@XmlRes int preferencesResId) {
         super.addPreferencesFromResource(preferencesResId);
         checkAvailablePrefs(getPreferenceScreen());