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/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -34,7 +35,6 @@ import android.provider.SearchIndexableResource;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -90,7 +90,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr
@Override
public int getMetricsCategory() {
return MetricsEvent.ENABLE_VIRTUAL_KEYBOARDS;
return SettingsEnums.ENABLE_VIRTUAL_KEYBOARDS;
}
@Nullable

4
src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -31,7 +31,7 @@ public class InputMethodAndSubtypeEnabler extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_SUBTYPE_ENABLER;
return SettingsEnums.INPUTMETHOD_SUBTYPE_ENABLER;
}
@Override

4
src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.inputmethod;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -40,7 +41,6 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.AsyncTaskLoader;
import androidx.loader.content.Loader;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -66,7 +66,7 @@ public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_KEYBOARD_LAYOUT;
return SettingsEnums.DIALOG_KEYBOARD_LAYOUT;
}
@Override

4
src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputDeviceIdentifier;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -36,7 +36,7 @@ public class KeyboardLayoutPickerFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_KEYBOARD;
return SettingsEnums.INPUTMETHOD_KEYBOARD;
}
@Override

4
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.inputmethod;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.database.ContentObserver;
@@ -39,7 +40,6 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
import com.android.settings.Settings;
@@ -132,7 +132,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.PHYSICAL_KEYBOARDS;
return SettingsEnums.PHYSICAL_KEYBOARDS;
}
private void scheduleUpdateHardKeyboards() {

4
src/com/android/settings/inputmethod/SpellCheckersSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.ApplicationInfo;
@@ -33,7 +34,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -58,7 +58,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_SPELL_CHECKERS;
return SettingsEnums.INPUTMETHOD_SPELL_CHECKERS;
}
@Override

4
src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -25,7 +26,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
@@ -105,7 +105,7 @@ public class UserDictionaryAddWordFragment extends InstrumentedFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_USER_DICTIONARY_ADD_WORD;
return SettingsEnums.INPUTMETHOD_USER_DICTIONARY_ADD_WORD;
}
@Override

4
src/com/android/settings/inputmethod/UserDictionaryList.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.inputmethod;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
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;
@@ -38,7 +38,7 @@ public class UserDictionaryList extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_USER_DICTIONARY;
return SettingsEnums.INPUTMETHOD_USER_DICTIONARY;
}
@Override

4
src/com/android/settings/inputmethod/UserDictionarySettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.inputmethod;
import android.annotation.Nullable;
import android.app.ActionBar;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -42,7 +43,6 @@ import androidx.fragment.app.ListFragment;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
@@ -68,7 +68,7 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.USER_DICTIONARY_SETTINGS;
return SettingsEnums.USER_DICTIONARY_SETTINGS;
}
@Override

4
src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.inputmethod;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
@@ -29,7 +30,6 @@ import android.view.inputmethod.InputMethodManager;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -75,7 +75,7 @@ public final class VirtualKeyboardFragment extends SettingsPreferenceFragment im
@Override
public int getMetricsCategory() {
return MetricsEvent.VIRTUAL_KEYBOARDS;
return SettingsEnums.VIRTUAL_KEYBOARDS;
}
private void updateInputMethodPreferenceViews() {