From ae5f82d36bebe793ad1cd4d4439cedee7f847695 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 17 Oct 2024 15:02:58 +0800 Subject: [PATCH] Move the annotation right before String Fix: 374015480 Test: build Flag: EXEMPT N/A Change-Id: Id4eb78319b10f63a0a8959643b63ed9a598f24af --- src/com/android/settings/DisplaySettings.java | 3 +-- src/com/android/settings/LegalSettings.java | 3 +-- .../settings/fuelgauge/batterysaver/BatterySaverSettings.java | 3 +-- src/com/android/settings/network/NetworkDashboardFragment.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index a0950066770..10763d00102 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -97,9 +97,8 @@ public class DisplaySettings extends DashboardFragment { } }; - @Nullable @Override - public String getPreferenceScreenBindingKey(@NonNull Context context) { + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { return DisplayScreen.KEY; } } diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index e48da2663b9..533dde3bb29 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -50,9 +50,8 @@ public class LegalSettings extends DashboardFragment { public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.about_legal); - @Nullable @Override - public String getPreferenceScreenBindingKey(@NonNull Context context) { + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { return LegalSettingsScreen.KEY; } } diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 8373d03de17..df6c1d9729d 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -97,9 +97,8 @@ public class BatterySaverSettings extends DashboardFragment { } } - @Nullable @Override - public String getPreferenceScreenBindingKey(@NonNull Context context) { + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { return BatterySaverScreen.KEY; } } diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 3ba3dc6853c..2585d04a3f0 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -117,9 +117,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements } }; - @Nullable @Override - public String getPreferenceScreenBindingKey(@NonNull Context context) { + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { return NetworkDashboardScreen.KEY; } }