am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev

* commit '221f3771aa3830ca8b8b662994759431dae2ee5b':
  Hide screenshot preference when assist is disabled
This commit is contained in:
Jorim Jaggi
2015-07-08 22:37:47 +00:00
committed by Android Git Automerger

View File

@@ -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);