diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-20 19:50:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 19:50:50 +0000 |
| commit | 78ead58df03e476d656c7e875fff9ade13b727c1 (patch) | |
| tree | 6ee65539bc80c39aa9f9eb99d947cc330fe5f30d /api | |
| parent | bde85f741c2ccbb7d719cdf0a48a607b104c3943 (diff) | |
| parent | 17f693520da8977c4a60f5b4be3be035cba7146c (diff) | |
| download | frameworks_base-78ead58df03e476d656c7e875fff9ade13b727c1.zip frameworks_base-78ead58df03e476d656c7e875fff9ade13b727c1.tar.gz frameworks_base-78ead58df03e476d656c7e875fff9ade13b727c1.tar.bz2 | |
Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 426cbd6..21ca33c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3466,6 +3466,7 @@ package android.app { method public final void setVolumeControlStream(int); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); + method public boolean showAssist(android.os.Bundle); method public final deprecated void showDialog(int); method public final deprecated boolean showDialog(int, android.os.Bundle); method public void showLockTaskEscapeMessage(); @@ -28808,6 +28809,7 @@ package android.service.voice { method public android.content.Context getContext(); method public int getDisabledShowContext(); method public android.view.LayoutInflater getLayoutInflater(); + method public int getUserDisabledShowContext(); method public android.app.Dialog getWindow(); method public void hide(); method public void onAssistStructureFailure(java.lang.Throwable); @@ -28843,6 +28845,7 @@ package android.service.voice { method public void setTheme(int); method public void show(android.os.Bundle, int); method public void startVoiceActivity(android.content.Intent); + field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8 field public static final int SHOW_SOURCE_ASSIST_GESTURE = 4; // 0x4 field public static final int SHOW_WITH_ASSIST = 1; // 0x1 field public static final int SHOW_WITH_SCREENSHOT = 2; // 0x2 diff --git a/api/system-current.txt b/api/system-current.txt index 3d11612..bbff8c0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3569,6 +3569,7 @@ package android.app { method public final void setVolumeControlStream(int); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); + method public boolean showAssist(android.os.Bundle); method public final deprecated void showDialog(int); method public final deprecated boolean showDialog(int, android.os.Bundle); method public void showLockTaskEscapeMessage(); @@ -30960,6 +30961,7 @@ package android.service.voice { method public android.content.Context getContext(); method public int getDisabledShowContext(); method public android.view.LayoutInflater getLayoutInflater(); + method public int getUserDisabledShowContext(); method public android.app.Dialog getWindow(); method public void hide(); method public void onAssistStructureFailure(java.lang.Throwable); @@ -30995,6 +30997,7 @@ package android.service.voice { method public void setTheme(int); method public void show(android.os.Bundle, int); method public void startVoiceActivity(android.content.Intent); + field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8 field public static final int SHOW_SOURCE_ASSIST_GESTURE = 4; // 0x4 field public static final int SHOW_WITH_ASSIST = 1; // 0x1 field public static final int SHOW_WITH_SCREENSHOT = 2; // 0x2 |