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

4
src/com/android/settings/gestures/AssistGestureSettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
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.overlay.FeatureFactory;
@@ -39,7 +39,7 @@ public class AssistGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_ASSIST_GESTURE;
return SettingsEnums.SETTINGS_ASSIST_GESTURE;
}
@Override

4
src/com/android/settings/gestures/DoubleTapPowerSettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
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.dashboard.suggestions.SuggestionFeatureProvider;
@@ -50,7 +50,7 @@ public class DoubleTapPowerSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_POWER;
return SettingsEnums.SETTINGS_GESTURE_DOUBLE_TAP_POWER;
}
@Override

4
src/com/android/settings/gestures/DoubleTapScreenSettings.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.SearchIndexableResource;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -54,7 +54,7 @@ public class DoubleTapScreenSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_SCREEN;
return SettingsEnums.SETTINGS_GESTURE_DOUBLE_TAP_SCREEN;
}
@Override

4
src/com/android/settings/gestures/DoubleTwistGestureSettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
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.dashboard.suggestions.SuggestionFeatureProvider;
@@ -50,7 +50,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TWIST;
return SettingsEnums.SETTINGS_GESTURE_DOUBLE_TWIST;
}
@Override

4
src/com/android/settings/gestures/GestureSettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -38,7 +38,7 @@ public class GestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURES;
return SettingsEnums.SETTINGS_GESTURES;
}
@Override

4
src/com/android/settings/gestures/GesturesSettingPreferenceController.java
View File

@@ -20,6 +20,8 @@ import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import androidx.annotation.NonNull;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -29,8 +31,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
public class GesturesSettingPreferenceController extends BasePreferenceController {
private final AssistGestureFeatureProvider mFeatureProvider;
private List<AbstractPreferenceController> mGestureControllers;

4
src/com/android/settings/gestures/PickupGestureSettings.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.SearchIndexableResource;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -54,7 +54,7 @@ public class PickupGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_PICKUP;
return SettingsEnums.SETTINGS_GESTURE_PICKUP;
}
@Override

8
src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
View File

@@ -24,6 +24,10 @@ import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -37,10 +41,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
public class PreventRingingGesturePreferenceController extends AbstractPreferenceController
implements RadioButtonPreference.OnClickListener, LifecycleObserver, OnSaveInstanceState,
OnResume, OnPause, OnCreate, PreferenceControllerMixin {

4
src/com/android/settings/gestures/PreventRingingGestureSettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
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;
@@ -56,7 +56,7 @@ public class PreventRingingGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_PREVENT_RINGING;
return SettingsEnums.SETTINGS_PREVENT_RINGING;
}
@Override

4
src/com/android/settings/gestures/SwipeToNotificationSettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
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.dashboard.suggestions.SuggestionFeatureProvider;
@@ -50,7 +50,7 @@ public class SwipeToNotificationSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_TO_NOTIFICATION;
return SettingsEnums.SETTINGS_GESTURE_SWIPE_TO_NOTIFICATION;
}
@Override

4
src/com/android/settings/gestures/SwipeUpGestureSettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
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.dashboard.suggestions.SuggestionFeatureProvider;
@@ -50,7 +50,7 @@ public class SwipeUpGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_UP;
return SettingsEnums.SETTINGS_GESTURE_SWIPE_UP;
}
@Override

4
src/com/android/settings/gestures/WakeLockScreenGestureSettings.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.SearchIndexableResource;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -54,7 +54,7 @@ public class WakeLockScreenGestureSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GESTURE_WAKE_LOCK_SCREEN;
return SettingsEnums.SETTINGS_GESTURE_WAKE_LOCK_SCREEN;
}
@Override