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

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
View File

@@ -15,8 +15,7 @@ package com.android.settings.display;
import static android.provider.Settings.Secure.DOZE_ENABLED;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
@@ -62,7 +61,7 @@ public class AmbientDisplayNotificationsPreferenceController extends
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_AMBIENT_DISPLAY_NOTIFICATIONS.equals(preference.getKey())) {
mMetricsFeatureProvider.action(mContext, ACTION_AMBIENT_DISPLAY);
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AMBIENT_DISPLAY);
}
return false;
}

4
src/com/android/settings/display/AutoBrightnessSettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,7 +53,7 @@ public class AutoBrightnessSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_AUTO_BRIGHTNESS;
return SettingsEnums.SETTINGS_AUTO_BRIGHTNESS;
}
@Override

4
src/com/android/settings/display/AutoRotatePreferenceController.java
View File

@@ -13,12 +13,12 @@
*/
package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.view.RotationPolicy;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
@@ -89,7 +89,7 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i
@Override
public boolean setChecked(boolean isChecked) {
final boolean isLocked = !isChecked;
mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ROTATION_LOCK,
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK,
isLocked);
RotationPolicy.setRotationLock(mContext, isLocked);
return true;

4
src/com/android/settings/display/ColorModePreferenceFragment.java
View File

@@ -13,6 +13,7 @@
*/
package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.provider.SearchIndexableResource;
@@ -21,7 +22,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -149,7 +149,7 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.COLOR_MODE_SETTINGS;
return SettingsEnums.COLOR_MODE_SETTINGS;
}
@VisibleForTesting

1
src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
View File

@@ -17,6 +17,7 @@ import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.UserHandle;
import android.provider.Settings.Secure;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.TogglePreferenceController;

6
src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java
View File

@@ -16,21 +16,21 @@
package com.android.settings.display;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import android.app.settings.SettingsEnums;
public class FontSizePreferenceFragmentForSetupWizard
extends ToggleFontSizePreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE;
return SettingsEnums.SUW_ACCESSIBILITY_FONT_SIZE;
}
@Override
public void onStop() {
// Log the final choice in value if it's different from the previous value.
if (mCurrentIndex != mInitialIndex) {
mMetricsFeatureProvider.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE,
mMetricsFeatureProvider.action(getContext(), SettingsEnums.SUW_ACCESSIBILITY_FONT_SIZE,
mCurrentIndex);
}

3
src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
View File

@@ -17,11 +17,10 @@
package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import androidx.preference.Preference;
import android.hardware.display.ColorDisplayManager;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;

3
src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
View File

@@ -17,11 +17,10 @@
package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import androidx.preference.Preference;
import android.hardware.display.ColorDisplayManager;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;

3
src/com/android/settings/display/NightDisplayFooterPreferenceController.java
View File

@@ -17,11 +17,10 @@
package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import androidx.preference.Preference;
import android.hardware.display.ColorDisplayManager;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.FooterPreference;

2
src/com/android/settings/display/NightDisplayPreferenceController.java
View File

@@ -14,8 +14,8 @@
package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;

8
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.display;
import android.app.Dialog;
import android.app.TimePickerDialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.Bundle;
@@ -26,7 +27,6 @@ import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -116,9 +116,9 @@ public class NightDisplaySettings extends DashboardFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_START_TIME:
return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_START_TIME;
return SettingsEnums.DIALOG_NIGHT_DISPLAY_SET_START_TIME;
case DIALOG_END_TIME:
return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_END_TIME;
return SettingsEnums.DIALOG_NIGHT_DISPLAY_SET_END_TIME;
default:
return 0;
}
@@ -161,7 +161,7 @@ public class NightDisplaySettings extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.NIGHT_DISPLAY_SETTINGS;
return SettingsEnums.NIGHT_DISPLAY_SETTINGS;
}
@Override

4
src/com/android/settings/display/PreviewPagerAdapter.java
View File

@@ -19,11 +19,9 @@ import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
import android.content.Context;
import android.content.res.Configuration;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
import android.view.ViewStub.OnInflateListener;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
@@ -32,8 +30,6 @@ import android.widget.LinearLayout;
import androidx.viewpager.widget.PagerAdapter;
import com.android.settings.support.actionbar.HelpResourceProvider;
/**
* A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen
* regarding a single setting and allowing the user to swipe across them.

6
src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
View File

@@ -16,13 +16,13 @@
package com.android.settings.display;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import android.app.settings.SettingsEnums;
public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettings {
@Override
public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE;
return SettingsEnums.SUW_ACCESSIBILITY_DISPLAY_SIZE;
}
@Override
@@ -30,7 +30,7 @@ public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettin
// Log the final choice in value if it's different from the previous value.
if (mCurrentIndex != mInitialIndex) {
mMetricsFeatureProvider.action(
getContext(), MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE, mCurrentIndex);
getContext(), SettingsEnums.SUW_ACCESSIBILITY_DISPLAY_SIZE, mCurrentIndex);
}
super.onStop();

4
src/com/android/settings/display/ScreenZoomSettings.java
View File

@@ -17,13 +17,13 @@
package com.android.settings.display;
import android.annotation.Nullable;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.view.Display;
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;
@@ -113,7 +113,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.DISPLAY_SCREEN_ZOOM;
return SettingsEnums.DISPLAY_SCREEN_ZOOM;
}
/** Index provider used to expose this fragment in search. */

4
src/com/android/settings/display/ThemePreferenceController.java
View File

@@ -13,8 +13,8 @@
*/
package com.android.settings.display;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.om.IOverlayManager;
import android.content.om.OverlayInfo;
@@ -70,7 +70,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_THEME.equals(preference.getKey())) {
mMetricsFeatureProvider.action(mContext, ACTION_THEME);
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_THEME);
}
return false;
}

4
src/com/android/settings/display/ToggleFontSizePreferenceFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.display;
import android.annotation.Nullable;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Configuration;
@@ -24,7 +25,6 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.provider.Settings;
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;
@@ -96,7 +96,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_FONT_SIZE;
return SettingsEnums.ACCESSIBILITY_FONT_SIZE;
}
/**

4
src/com/android/settings/display/VrDisplayPreferencePicker.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
@@ -40,7 +40,7 @@ public class VrDisplayPreferencePicker extends RadioButtonPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE;
return SettingsEnums.VR_DISPLAY_PREFERENCE;
}
@Override