From 88075948007aa87cc6c859b5744d64871826a78a Mon Sep 17 00:00:00 2001
From: Salvador Martinez <dehboxturtle@google.com>
Date: Thu, 29 Sep 2016 10:49:42 -0700
Subject: [PATCH] Maintain focus on switch for a11y

Modified subsetting where user can toggle
if an app should be able to modify system
settings so that talkback announces state
change properly.

Test: Accessibility Scanner, Manual Verification
Bug: 31755538
Change-Id: I54ad016b5edb0937b77cfdeef0cfcae24a78e2a2
---
 .../android/settings/applications/WriteSettingsDetails.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/WriteSettingsDetails.java b/src/com/android/settings/applications/WriteSettingsDetails.java
index f11ea2da041..c11fff61df9 100644
--- a/src/com/android/settings/applications/WriteSettingsDetails.java
+++ b/src/com/android/settings/applications/WriteSettingsDetails.java
@@ -142,8 +142,9 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
         // you can't ask a user for a permission you didn't even declare!
         mSwitchPref.setEnabled(mWriteSettingsState.permissionDeclared);
         mWriteSettingsPrefs.setEnabled(canWrite);
-        getPreferenceScreen().removePreference(mWriteSettingsPrefs);
-
+        if (getPreferenceScreen().findPreference(KEY_APP_OPS_SETTINGS_PREFS) != null) {
+            getPreferenceScreen().removePreference(mWriteSettingsPrefs);
+        }
         return true;
     }