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

Commit 134e4b28 authored by Dan Sandler's avatar Dan Sandler Committed by Daniel Sandler
Browse files

resolve merge conflicts of aad998c0 to pi-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icf172daeb848f746c81acd25a4406decc00ed875
Merged-In: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
parents bae081d2 aad998c0

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

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>