Merge "Move the annotation right before String" into main

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }