Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev

am: 2540d66bfe

* commit '2540d66bfed468615d560e93eaaa3621296db0ec':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I946cec97b7d891f29b8b026d5889511b227512d3
This commit is contained in:
Clara Bayarri
2016-05-06 13:40:18 +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() {