diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:18 +0000 |
| commit | d7a8e234e9b94ff36cd271555a0bbf8a01a10932 (patch) | |
| tree | b6c98b0e3e76f797dbc57e77a8aac776ca1d1324 /src/com/android/settings/users/AutoSyncDataPreferenceController.java | |
| parent | 1e53efc4c48ec80421bb0542b770332ab8efdab5 (diff) | |
| parent | 7195e05dfaf1c848a7af9b844cd8bd05e9c220fe (diff) | |
| download | packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.gz packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.bz2 packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'src/com/android/settings/users/AutoSyncDataPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/users/AutoSyncDataPreferenceController.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 42de892146..e7c5cb699a 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -16,9 +16,8 @@ package com.android.settings.users; import android.app.ActivityManager; -import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; +import android.app.settings.SettingsEnums; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -26,11 +25,13 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; -import com.android.internal.logging.nano.MetricsProto; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -146,7 +147,7 @@ public class AutoSyncDataPreferenceController extends AbstractPreferenceControll @Override public int getMetricsCategory() { - return MetricsProto.MetricsEvent.DIALOG_CONFIRM_AUTO_SYNC_CHANGE; + return SettingsEnums.DIALOG_CONFIRM_AUTO_SYNC_CHANGE; } @Override |