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

am: 70c5569a18

* commit '70c5569a1877d2889e16a9d32133e5293bfacf83':
  Remove invisible object in A11y Settings screens' menu

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