PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
  Hide screenshot preference when assist is disabled
This commit is contained in:
Jorim Jaggi
2015-07-08 22:08:34 +00:00
committed by Android Git Automerger
parent 68fdb73d0c b493b29101
commit 3b517b6805
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/ManageAssist.java
View File

@@ -109,8 +109,10 @@ public class ManageAssist extends SettingsPreferenceFragment
final boolean hasAssistant = currentAssist != null; final boolean hasAssistant = currentAssist != null;
if (hasAssistant) { if (hasAssistant) {
getPreferenceScreen().addPreference(mContextPref); getPreferenceScreen().addPreference(mContextPref);
getPreferenceScreen().addPreference(mScreenshotPref);
} else { } else {
getPreferenceScreen().removePreference(mContextPref); getPreferenceScreen().removePreference(mContextPref);
getPreferenceScreen().removePreference(mScreenshotPref);
} }
mVoiceInputPref.setAssistRestrict(currentAssist); mVoiceInputPref.setAssistRestrict(currentAssist);