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

6
src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java
View File

@@ -19,12 +19,12 @@ package com.android.settings.development;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class AllowBackgroundActivityStartsPreferenceController
extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

4
src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.PowerManager;
@@ -24,7 +25,6 @@ import android.os.PowerManager;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -46,7 +46,7 @@ public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragme
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_DISABLE_A2DP_HW_OFFLOAD;
return SettingsEnums.DIALOG_BLUETOOTH_DISABLE_A2DP_HW_OFFLOAD;
}
@Override

1
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.debug.IAdbManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.UserManager;
import android.sysprop.AdbProperties;
import android.text.TextUtils;

4
src/com/android/settings/development/ClearAdbKeysWarningDialog.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -45,7 +45,7 @@ public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implem
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_CLEAR_ADB_KEYS;
return SettingsEnums.DIALOG_CLEAR_ADB_KEYS;
}
@Override

4
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothCodecStatus;
@@ -37,7 +38,6 @@ import android.widget.Switch;
import androidx.annotation.VisibleForTesting;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -207,7 +207,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEVELOPMENT;
return SettingsEnums.DEVELOPMENT;
}
@Override

8
src/com/android/settings/development/DisableDevSettingsDialogFragment.java
View File

@@ -17,17 +17,17 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.PowerManager;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -51,7 +51,7 @@ public class DisableDevSettingsDialogFragment extends InstrumentedDialogFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_DISABLE_DEVELOPMENT_OPTIONS;
return SettingsEnums.DIALOG_DISABLE_DEVELOPMENT_OPTIONS;
}
@Override

4
src/com/android/settings/development/DisableLogPersistWarningDialog.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -49,7 +49,7 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_LOG_PERSIST;
return SettingsEnums.DIALOG_LOG_PERSIST;
}
@Override

4
src/com/android/settings/development/EnableAdbWarningDialog.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -44,7 +44,7 @@ public class EnableAdbWarningDialog extends InstrumentedDialogFragment implement
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ENABLE_ADB;
return SettingsEnums.DIALOG_ENABLE_ADB;
}
@Override

4
src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
View File

@@ -17,13 +17,13 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -45,7 +45,7 @@ public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFra
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ENABLE_DEVELOPMENT_OPTIONS;
return SettingsEnums.DIALOG_ENABLE_DEVELOPMENT_OPTIONS;
}
@Override

4
src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -24,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -45,7 +45,7 @@ public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragm
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ENABLE_OEM_UNLOCKING;
return SettingsEnums.DIALOG_ENABLE_OEM_UNLOCKING;
}
@Override

1
src/com/android/settings/development/ForceMSAAPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.development;
import android.content.Context;
import android.sysprop.DisplayProperties;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;

3
src/com/android/settings/development/MockLocationAppPreferenceController.java
View File

@@ -16,8 +16,7 @@
package com.android.settings.development;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_MOCK_LOCATION_APP;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_MOCK_LOCATION_APP;
import android.Manifest;
import android.app.Activity;

4
src/com/android/settings/development/OemLockInfoDialog.java
View File

@@ -17,13 +17,13 @@
package com.android.settings.development;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -41,7 +41,7 @@ public class OemLockInfoDialog extends InstrumentedDialogFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_OEM_LOCK_INFO;
return SettingsEnums.DIALOG_OEM_LOCK_INFO;
}
@Override

3
src/com/android/settings/development/OemUnlockPreferenceController.java
View File

@@ -16,8 +16,7 @@
package com.android.settings.development;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_CODE_ENABLE_OEM_UNLOCK;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_ENABLE_OEM_UNLOCK;
import android.app.Activity;
import android.content.Context;

10
src/com/android/settings/development/OverlayCategoryPreferenceController.java
View File

@@ -26,6 +26,11 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -34,11 +39,6 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
/**
* Preference controller to allow users to choose an overlay from a list for a given category.
* The chosen overlay is enabled exclusively within its category. A default option is also

3
src/com/android/settings/development/SelectDebugAppPreferenceController.java
View File

@@ -16,8 +16,7 @@
package com.android.settings.development;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_CODE_DEBUG_APP;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP;
import android.app.Activity;
import android.content.Context;

1
src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.development;
import android.content.Context;
import android.sysprop.DisplayProperties;
import android.view.View;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;

6
src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java
View File

@@ -19,12 +19,12 @@ package com.android.settings.development;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
// STOPSHIP b/118694572: remove the kill switch once the feature is tested and stable
public class SmsAccessRestrictionPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

3
src/com/android/settings/development/WaitForDebuggerPreferenceController.java
View File

@@ -16,8 +16,7 @@
package com.android.settings.development;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_CODE_DEBUG_APP;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP;
import android.app.Activity;
import android.app.ActivityManager;

2
src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
View File

@@ -23,8 +23,6 @@ import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.FeatureFlags;
import java.util.HashSet;

4
src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.development.featureflags;
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;
@@ -39,7 +39,7 @@ public class FeatureFlagsDashboard extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_FEATURE_FLAGS_DASHBOARD;
return SettingsEnums.SETTINGS_FEATURE_FLAGS_DASHBOARD;
}
@Override

6
src/com/android/settings/development/gup/GupDashboard.java
View File

@@ -16,16 +16,14 @@
package com.android.settings.development.gup;
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;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.search.SearchIndexable;
@@ -38,7 +36,7 @@ public class GupDashboard extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_GUP_DASHBOARD;
return SettingsEnums.SETTINGS_GUP_DASHBOARD;
}
@Override

4
src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.development.qstile;
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;
@@ -46,7 +46,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEVELOPMENT_QS_TILE_CONFIG;
return SettingsEnums.DEVELOPMENT_QS_TILE_CONFIG;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

1
src/com/android/settings/development/qstile/DevelopmentTiles.java
View File

@@ -31,7 +31,6 @@ import android.sysprop.DisplayProperties;
import android.util.Log;
import android.view.IWindowManager;
import android.view.ThreadedRenderer;
import android.view.View;
import android.view.WindowManagerGlobal;
import android.widget.Toast;