Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe am: 70c5569a18

am: 6d11ab8a93

* commit '6d11ab8a93bf8ce071898caae3667e7eb1a4c05b':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I7d8714a92a16e57c013df71fa3f0fc5c4ee4c24c
This commit is contained in:
Clara Bayarri
2016-05-06 13:49:56 +00:00
committed by android-build-merger

View File

@@ -114,9 +114,11 @@ public abstract class ToggleFeaturePreferenceFragment
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
MenuItem menuItem = menu.add(mSettingsTitle);
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
menuItem.setIntent(mSettingsIntent);
if (mSettingsTitle != null && mSettingsIntent != null) {
MenuItem menuItem = menu.add(mSettingsTitle);
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
menuItem.setIntent(mSettingsIntent);
}
}
protected void onInstallSwitchBarToggleSwitch() {