Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730d1d5c authored by Steve Elliott's avatar Steve Elliott Committed by Daniel Sandler
Browse files

DO NOT MERGE: Add configurable default setting for assistant componentname 

By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

Test: manual
Bug: 111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
parent 34c2fcff

core/java/com/android/internal/app/AssistUtils.java

+6 −0
Original line number Diff line number Diff line
@@ -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();

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -3521,4 +3521,8 @@ 


    <!-- Brand value for attestation of misprovisioned device. -->

    <string name="config_misprovisionedBrandValue" translatable="false"></string>



    <!-- Component name for default assistant on this device -->

    <string name="config_defaultAssistantComponentName"></string>



</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3417,4 +3417,6 @@ 
  <java-symbol type="string" name="config_misprovisionedBrandValue" />



  <java-symbol type="integer" name="db_wal_truncate_size" />



  <java-symbol type="string" name="config_defaultAssistantComponentName" />

</resources>