Merge changes from topic "settings_westworld"

* changes:
  Reset allow background activity to default on
  Migrate all MetricsProto enums to SettingsEnums
This commit is contained in:
TreeHugger Robot
2019-01-19 04:09:50 +00:00
committed by Android (Google) Code Review
503 changed files with 1191 additions and 1358 deletions

View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.Bundle;
@@ -27,7 +28,6 @@ import android.widget.Switch;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -48,7 +48,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER;
return SettingsEnums.ACCESSIBILITY_TOGGLE_DALTONIZER;
}
@Override