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

Merge "Added survey support to second fragment type"

Browse Source
This commit is contained in:
Salvador Martinez
2017-02-01 00:09:23 +00:00
committed by Android (Google) Code Review
parent e5c2d1fbe3 09f182c385
commit 3bf9c5d57a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/core/InstrumentedFragment.java
View File

@@ -23,6 +23,7 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.core.instrumentation.VisibilityLoggerMixin; import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.core.lifecycle.ObservableFragment; import com.android.settings.core.lifecycle.ObservableFragment;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin;
public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable { public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable {
@@ -31,6 +32,7 @@ public abstract class InstrumentedFragment extends ObservableFragment implements
public InstrumentedFragment() { public InstrumentedFragment() {
// Mixin that logs visibility change for activity. // Mixin that logs visibility change for activity.
getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory())); getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory()));
getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
} }
@Override @Override

6
src/com/android/settings/survey/SurveyMixin.java
View File

@@ -16,8 +16,8 @@
package com.android.settings.survey; package com.android.settings.survey;
import android.app.Activity; import android.app.Activity;
import android.app.Fragment;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.core.lifecycle.LifecycleObserver; import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause; import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume; 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 { public class SurveyMixin implements LifecycleObserver, OnResume, OnPause {
private String mName; private String mName;
private InstrumentedPreferenceFragment mFragment; private Fragment mFragment;
private BroadcastReceiver mReceiver; 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 fragment The fragment that this mixin will be attached to.
* @param fragmentName The simple name of the fragment. * @param fragmentName The simple name of the fragment.
*/ */
public SurveyMixin(InstrumentedPreferenceFragment fragment, String fragmentName) { public SurveyMixin(Fragment fragment, String fragmentName) {
mName = fragmentName; mName = fragmentName;
mFragment = fragment; mFragment = fragment;
} }