From e812350286503d225115425c3c47d667b1353822 Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Fri, 6 May 2016 12:16:49 +0100
Subject: [PATCH] Remove invisible object in A11y Settings screens' menu

Bug: 28459491
Change-Id: I95250078bf6470d0bd4b6b40f25c13eb6aec93c8
---
 .../accessibility/ToggleFeaturePreferenceFragment.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index e1c4f7e5852..6a4eb5f47f4 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -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() {