diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-08 22:08:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 22:08:34 +0000 |
| commit | 3b517b68057857a2b2552dd09e520907c809f15a (patch) | |
| tree | 7e994a8b69bcbcaeb4ae05f2dc20225dfc4e265f | |
| parent | 68fdb73d0cb2e354063ff5e37349d942923e379e (diff) | |
| parent | b493b2910190b95bba6cad0f328a0339acebef9b (diff) | |
| download | packages_apps_Settings-3b517b68057857a2b2552dd09e520907c809f15a.zip packages_apps_Settings-3b517b68057857a2b2552dd09e520907c809f15a.tar.gz packages_apps_Settings-3b517b68057857a2b2552dd09e520907c809f15a.tar.bz2 | |
am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
Hide screenshot preference when assist is disabled
| -rw-r--r-- | src/com/android/settings/applications/ManageAssist.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java index f4382f8..fe9d178 100644 --- a/src/com/android/settings/applications/ManageAssist.java +++ b/src/com/android/settings/applications/ManageAssist.java @@ -109,8 +109,10 @@ public class ManageAssist extends SettingsPreferenceFragment final boolean hasAssistant = currentAssist != null; if (hasAssistant) { getPreferenceScreen().addPreference(mContextPref); + getPreferenceScreen().addPreference(mScreenshotPref); } else { getPreferenceScreen().removePreference(mContextPref); + getPreferenceScreen().removePreference(mScreenshotPref); } mVoiceInputPref.setAssistRestrict(currentAssist); |