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

Use MetricsFeatureProvider in storage manager fragment.

Browse Source 
Bug: 31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
      verifying log

Change-Id: I65743b87fdf6f010e40ca705e33e18642e0bfca3
This commit is contained in:
Fan Zhang
2016-09-22 10:04:40 -07:00
parent 7cb1453a84
commit 5b9762bc09
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,11 +16,14 @@
package com.android.settings.core; package com.android.settings.core;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import com.android.settings.core.instrumentation.Instrumentable; import com.android.settings.core.instrumentation.Instrumentable;
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.ObservablePreferenceFragment; import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
import com.android.settings.overlay.FeatureFactory;
/** /**
* Instrumented fragment that logs visibility state. * Instrumented fragment that logs visibility state.
@@ -28,11 +31,19 @@ import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
public abstract class InstrumentedFragment extends ObservablePreferenceFragment public abstract class InstrumentedFragment extends ObservablePreferenceFragment
implements Instrumentable { implements Instrumentable {
protected MetricsFeatureProvider mMetricsFeatureProvider;
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()));
} }
@Override
public void onAttach(Context context) {
super.onAttach(context);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@Override @Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
} }

20
src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
View File

@@ -18,30 +18,20 @@ package com.android.settings.deletionhelper;
import android.app.Activity; import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.format.DateUtils;
import android.text.format.Formatter;
import android.util.Log;
import android.view.View;
import android.widget.Switch;
import android.support.v14.preference.SwitchPreference; import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.DropDownPreference; import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen; import android.text.format.DateUtils;
import android.text.format.Formatter;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.widget.SwitchBar; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
/** /**
* AutomaticStorageManagerSettings is the Settings screen for configuration and management of the * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the
@@ -142,8 +132,8 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
switch (preference.getKey()) { switch (preference.getKey()) {
case KEY_STORAGE_MANAGER_SWITCH: case KEY_STORAGE_MANAGER_SWITCH:
boolean storageManagerChecked = (boolean) newValue; boolean storageManagerChecked = (boolean) newValue;
MetricsLogger.action(getContext(), MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, mMetricsFeatureProvider.action(getContext(),
storageManagerChecked); MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, storageManagerChecked);
mDaysToRetain.setEnabled(storageManagerChecked); mDaysToRetain.setEnabled(storageManagerChecked);
Settings.Secure.putInt(getContentResolver(), Settings.Secure.putInt(getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,