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/language/LanguageAndInputSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.language;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -30,7 +31,6 @@ import android.view.inputmethod.InputMethodManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
@@ -58,7 +58,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY;
return SettingsEnums.SETTINGS_LANGUAGE_CATEGORY;
}
@Override

4
src/com/android/settings/language/PhoneLanguagePreferenceController.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.language;
import android.app.settings.SettingsEnums;
import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
@@ -74,7 +74,7 @@ public class PhoneLanguagePreferenceController extends AbstractPreferenceControl
}
new SubSettingLauncher(mContext)
.setDestination(LocaleListEditor.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY)
.setSourceMetricsCategory(SettingsEnums.SETTINGS_LANGUAGE_CATEGORY)
.setTitleRes(R.string.language_picker_title)
.launch();
return true;