diff options
| author | 2018-10-17 18:56:22 -0400 | |
|---|---|---|
| committer | 2018-10-18 13:44:22 +0000 | |
| commit | 134e4b284be95cd8ad3dbb340bc1cae6b703dbd2 (patch) | |
| tree | f02336fe03ee67668ae38a62bdd4b548fd07b18f | |
| parent | bae081d20264d8df21854f27e618a1cb2a5e50fa (diff) | |
| parent | aad998c0b4b97190754e72548960cf72b967dc0f (diff) | |
resolve merge conflicts of aad998c0b4b97190754e72548960cf72b967dc0f to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icf172daeb848f746c81acd25a4406decc00ed875
Merged-In: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
| -rw-r--r-- | core/java/com/android/internal/app/AssistUtils.java | 6 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java index 9171959537c8..4f742843eb12 100644 --- a/core/java/com/android/internal/app/AssistUtils.java +++ b/core/java/com/android/internal/app/AssistUtils.java @@ -152,6 +152,12 @@ public class AssistUtils { return ComponentName.unflattenFromString(setting); } + final String defaultSetting = mContext.getResources().getString( + R.string.config_defaultAssistantComponentName); + if (defaultSetting != null) { + return ComponentName.unflattenFromString(defaultSetting); + } + // Fallback to keep backward compatible behavior when there is no user setting. if (activeServiceSupportsAssistGesture()) { return getActiveServiceComponentName(); diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 1fbf8d8e541d..ec87100e80b8 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3533,4 +3533,8 @@ <!-- Pre-scale volume at volume step 3 for Absolute Volume --> <fraction name="config_prescaleAbsoluteVolume_index3">85%</fraction> + + <!-- Component name for default assistant on this device --> + <string name="config_defaultAssistantComponentName"></string> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 954b9bcfd7ff..e4cf4f6210f9 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3423,4 +3423,6 @@ <java-symbol type="fraction" name="config_prescaleAbsoluteVolume_index1" /> <java-symbol type="fraction" name="config_prescaleAbsoluteVolume_index2" /> <java-symbol type="fraction" name="config_prescaleAbsoluteVolume_index3" /> + + <java-symbol type="string" name="config_defaultAssistantComponentName" /> </resources> |