Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8797e3b8 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Move the annotation right before String" into main

parents 286dcff1 ae5f82d3

src/com/android/settings/DisplaySettings.java

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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;

    }

}