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

am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev

Browse Source 
* commit '464e54f88b4aa933a7d26cb1afecf0ddfc282751':
  Disable voice input if assist is voice service
This commit is contained in:
Jorim Jaggi
2015-07-14 18:13:27 +00:00
committed by Android Git Automerger
parent cfb053f590 464e54f88b
commit d4391c22d1
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,7 @@ public class ManageAssist extends SettingsPreferenceFragment
private void updateUi() {
mDefaultAssitPref.refreshAssistApps();
mVoiceInputPref.refreshVoiceInputs();
final ComponentName currentAssist = mDefaultAssitPref.getCurrentAssist();
final boolean hasAssistant = currentAssist != null;
@@ -115,8 +116,19 @@ public class ManageAssist extends SettingsPreferenceFragment
getPreferenceScreen().removePreference(mScreenshotPref);
}
mVoiceInputPref.setAssistRestrict(currentAssist);
mVoiceInputPref.refreshVoiceInputs();
if (isCurrentAssistVoiceService()) {
getPreferenceScreen().removePreference(mVoiceInputPref);
} else {
getPreferenceScreen().addPreference(mVoiceInputPref);
mVoiceInputPref.setAssistRestrict(currentAssist);
}
}
private boolean isCurrentAssistVoiceService() {
ComponentName currentAssist = mDefaultAssitPref.getCurrentAssist();
ComponentName activeService = mVoiceInputPref.getCurrentService();
return currentAssist == null && activeService == null ||
currentAssist != null && currentAssist.equals(activeService);
}
private void confirmNewAssist(final String newAssitPackage) {