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

Commit 83fb90f6 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 

* commit '3f5f1cb6':
  Rename supportsAssistGesture to supportsAssist
parents eec5a4e7 3f5f1cb6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ package android { 
    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssistGesture = 16844011; // 0x10104eb

    field public static final int supportsAssist = 16844011; // 0x10104eb

    field public static final int supportsRtl = 16843695; // 0x10103af

    field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb

    field public static final int supportsUploading = 16843419; // 0x101029b

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ package android { 
    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssistGesture = 16844011; // 0x10104eb

    field public static final int supportsAssist = 16844011; // 0x10104eb

    field public static final int supportsRtl = 16843695; // 0x10103af

    field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb

    field public static final int supportsUploading = 16843419; // 0x101029b

core/java/android/service/voice/VoiceInteractionServiceInfo.java

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class VoiceInteractionServiceInfo { 
    private String mSessionService;

    private String mRecognitionService;

    private String mSettingsActivity;

    private boolean mSupportsAssistGesture;

    private boolean mSupportsAssist;



    public VoiceInteractionServiceInfo(PackageManager pm, ComponentName comp)

            throws PackageManager.NameNotFoundException {
@@ -95,8 +95,8 @@ public class VoiceInteractionServiceInfo { 
                    com.android.internal.R.styleable.VoiceInteractionService_recognitionService);

            mSettingsActivity = array.getString(

                    com.android.internal.R.styleable.VoiceInteractionService_settingsActivity);

            mSupportsAssistGesture = array.getBoolean(

                    com.android.internal.R.styleable.VoiceInteractionService_supportsAssistGesture,

            mSupportsAssist = array.getBoolean(

                    com.android.internal.R.styleable.VoiceInteractionService_supportsAssist,

                    false);

            array.recycle();

            if (mSessionService == null) {
@@ -145,7 +145,7 @@ public class VoiceInteractionServiceInfo { 
        return mSettingsActivity;

    }



    public boolean getSupportsAssistGesture() {

        return mSupportsAssistGesture;

    public boolean getSupportsAssist() {

        return mSupportsAssist;

    }

}

core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -105,5 +105,5 @@ interface IVoiceInteractionManagerService { 
     * Indicates whether the currently active voice interaction service is capable of handling the

     * assist gesture.

     */

    boolean activeServiceSupportsAssistGesture();

    boolean activeServiceSupportsAssist();

}

core/res/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -7304,8 +7304,8 @@ 
        <attr name="recognitionService" format="string" />

        <attr name="settingsActivity" />

        <!-- Flag indicating whether this voice interaction service is capable of handling the

             assist gesture. -->

        <attr name="supportsAssistGesture" format="boolean" />

             assist action. -->

        <attr name="supportsAssist" format="boolean" />

    </declare-styleable>



    <!-- Use <code>voice-enrollment-application</code>