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

Commit 3d2cba56 authored by Johan Redestig's avatar Johan Redestig Committed by android-build-merger
Browse files

Merge "Fix back button on fragments without help uris" into nyc-dev 

am: ed74511c

* commit 'ed74511c':
  Fix back button on fragments without help uris

Change-Id: Iea98f27e3784bb34fd4a272f2c450a5704e6555d
parents 9a22ccde ed74511c

src/com/android/settings/SettingsPreferenceFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -187,10 +187,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        if (!TextUtils.isEmpty(mHelpUri)) {

        setHasOptionsMenu(true);

    }

    }



    @Override

    public void onResume() {