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

Commit 3bf9c5d5 authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "Added survey support to second fragment type"

parents e5c2d1fb 09f182c3

src/com/android/settings/core/InstrumentedFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider; 
import com.android.settings.core.instrumentation.VisibilityLoggerMixin;

import com.android.settings.core.lifecycle.ObservableFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.survey.SurveyMixin;



public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable {
@@ -31,6 +32,7 @@ public abstract class InstrumentedFragment extends ObservableFragment implements 
    public InstrumentedFragment() {

        // Mixin that logs visibility change for activity.

        getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory()));

        getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));

    }



    @Override

src/com/android/settings/survey/SurveyMixin.java

+3 −3
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
package com.android.settings.survey;



import android.app.Activity;

import android.app.Fragment;

import android.content.BroadcastReceiver;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.lifecycle.LifecycleObserver;

import com.android.settings.core.lifecycle.events.OnPause;

import com.android.settings.core.lifecycle.events.OnResume;
@@ -32,7 +32,7 @@ import com.android.settings.overlay.SurveyFeatureProvider; 
public class SurveyMixin implements LifecycleObserver, OnResume, OnPause {



    private String mName;

    private InstrumentedPreferenceFragment mFragment;

    private Fragment mFragment;

    private BroadcastReceiver mReceiver;



    /**
@@ -42,7 +42,7 @@ public class SurveyMixin implements LifecycleObserver, OnResume, OnPause { 
     * @param fragment The fragment that this mixin will be attached to.

     * @param fragmentName The simple name of the fragment.

     */

    public SurveyMixin(InstrumentedPreferenceFragment fragment, String fragmentName) {

    public SurveyMixin(Fragment fragment, String fragmentName) {

        mName = fragmentName;

        mFragment = fragment;

    }