Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2015-05-01 20:34:21 +00:00
committed by Android (Google) Code Review
parent 9a4cdf5caa 5f560d0562
commit 0629a5d524
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

10
core/java/android/service/voice/VoiceInteractionServiceInfo.java
View File

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

2
core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
View File

@@ -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();
}

4
core/res/res/values/attrs.xml
View File

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

2
core/res/res/values/public.xml
View File

@@ -2663,7 +2663,7 @@
<public type="attr" name="autoVerify" />
<public type="attr" name="breakStrategy" />
<public type="attr" name="supportsAssistGesture" />
<public type="attr" name="supportsAssist" />
<public type="attr" name="thumbPosition" />
<!-- Placeholder for a removed attribute. Remove this before M release. -->

2
packages/SystemUI/src/com/android/systemui/assist/AssistGestureManager.java
View File

@@ -196,7 +196,7 @@ public class AssistGestureManager {
private boolean getVoiceInteractorSupportsAssistGesture() {
try {
return mVoiceInteractionManagerService.activeServiceSupportsAssistGesture();
return mVoiceInteractionManagerService.activeServiceSupportsAssist();
} catch (RemoteException e) {
Log.w(TAG, "Failed to call activeServiceSupportsAssistGesture", e);
return false;

4
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
View File

@@ -734,10 +734,10 @@ public class VoiceInteractionManagerService extends SystemService {
}
@Override
public boolean activeServiceSupportsAssistGesture() {
public boolean activeServiceSupportsAssist() {
enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE);
synchronized (this) {
return mImpl != null && mImpl.mInfo.getSupportsAssistGesture();
return mImpl != null && mImpl.mInfo.getSupportsAssist();
}
}

2
tests/Assist/res/xml/interaction_service.xml
View File

@@ -18,4 +18,4 @@
<voice-interaction-service xmlns:android="http://schemas.android.com/apk/res/android"
android:sessionService="com.android.test.assist.AssistInteractionSessionService"
android:recognitionService="com.android.test.assist.AssistRecognitionService"
android:supportsAssistGesture="true"/>
android:supportsAssist="true"/>

2
tests/VoiceInteraction/res/xml/interaction_service.xml
View File

@@ -21,4 +21,4 @@
android:sessionService="com.android.test.voiceinteraction.MainInteractionSessionService"
android:recognitionService="com.android.test.voiceinteraction.MainRecognitionService"
android:settingsActivity="com.android.test.voiceinteraction.SettingsActivity"
android:supportsAssistGesture="true" />
android:supportsAssist="true" />