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

port settings over to new metrics enum

Browse Source 
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
This commit is contained in:
Chris Wren
2016-01-26 18:04:01 -05:00
parent 6a83d7537d
commit 9d1bfd1e8d
143 changed files with 328 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -41,8 +41,9 @@ import android.text.TextUtils;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.DialogCreatable;
@@ -52,8 +53,9 @@ import com.android.settings.Utils;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import java.util.ArrayList;
@@ -63,8 +65,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
/**
* Activity with the accessibility settings.
*/
@@ -207,7 +207,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY;
return MetricsEvent.ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
View File

@@ -27,7 +27,7 @@ import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto;
import com.android.settings.DialogCreatable;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -55,7 +55,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY;
return MetricsProto.MetricsEvent.ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/CaptionPropertiesFragment.java
View File

@@ -35,7 +35,7 @@ import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.CaptioningManager;
import android.view.accessibility.CaptioningManager.CaptionStyle;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.SubtitleView;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -98,7 +98,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_CAPTION_PROPERTIES;
return MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES;
}
@Override

4
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -41,7 +41,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.ConfirmDeviceCredentialActivity;
import com.android.settings.R;
@@ -75,7 +75,7 @@ public class ToggleAccessibilityServicePreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_SERVICE;
return MetricsEvent.ACCESSIBILITY_SERVICE;
}
@Override

4
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -24,7 +24,7 @@ import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchBar;
@@ -38,7 +38,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_TOGGLE_DALTONIZER;
return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER;
}
@Override

4
src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.provider.Settings;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.widget.ToggleSwitch;
import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -46,6 +46,6 @@ public class ToggleGlobalGesturePreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
}

5
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -16,10 +16,9 @@
package com.android.settings.accessibility;
import android.os.Bundle;
import android.provider.Settings;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.widget.ToggleSwitch;
import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -71,6 +70,6 @@ public class ToggleScreenMagnificationPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
return MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
}
}