Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4978082b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge InstrumentedFragment & InstrumentedPerferenceFragment"

parents 6db9a132 bf4be77f
Loading
Loading
Loading
Loading
+0 −47
Original line number Diff line number Diff line
/*
 * 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());
    }
}
+1 −5
Original line number Diff line number Diff line
@@ -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);