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

Merge InstrumentedFragment & InstrumentedPerferenceFragment

Browse Source 
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
This commit is contained in:
Fan Zhang
2016-08-04 16:05:55 -07:00
parent b9eeb53a8d
commit bf4be77f7e
2 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/InstrumentedPreferenceFragment.java
View File

@@ -1,47 +0,0 @@
/*
* Copyright (C) 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings;
import android.support.v14.preference.PreferenceFragment;
import com.android.internal.logging.MetricsLogger;
/**
* Instrumented preference fragment that logs visibility state.
*/
public abstract class InstrumentedPreferenceFragment extends PreferenceFragment {
/**
* Declare the view of this category.
*
* Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent}
* or if there is no relevant existing category you may define one in
* {@link com.android.settings.InstrumentedFragment}.
*/
protected abstract int getMetricsCategory();
@Override
public void onResume() {
super.onResume();
MetricsLogger.visible(getActivity(), getMetricsCategory());
}
@Override
public void onPause() {
super.onPause();
MetricsLogger.hidden(getActivity(), getMetricsCategory());
}
}

6
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -52,7 +52,7 @@ import java.util.UUID;
/**
* 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 {
/**
@@ -132,10 +132,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
return root;
}
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
}
@Override
public void addPreferencesFromResource(@XmlRes int preferencesResId) {
super.addPreferencesFromResource(preferencesResId);