diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-02-11 15:59:44 +0000 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2015-03-05 15:02:27 +0000 |
| commit | 43261140c3995dea77d87b587f882e651617f4b4 (patch) | |
| tree | bc55a34ab64179d8ffe49158703da760c1fcf89a /api | |
| parent | 3782882192905147d05cf09a0ae568c19c2c2e22 (diff) | |
| download | frameworks_base-43261140c3995dea77d87b587f882e651617f4b4.zip frameworks_base-43261140c3995dea77d87b587f882e651617f4b4.tar.gz frameworks_base-43261140c3995dea77d87b587f882e651617f4b4.tar.bz2 | |
Clean up the lock task APIs for COSU devices.
Clean up and increase readability of internal handling of lock task mode APIs.
Add a public API to query the lock task mode state with pinned and locked as
possible outcomes. Additionally, change wording in lock task toasts when in
locked mode and update the javadoc regarding onLockTaskModeEntering and
onLockTaskModeExiting to represent the actual behaviour.
Bug: 19377096
Change-Id: Ia563078ca6ef6d6fc7e75130e6b94ba18af69340
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | api/system-current.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index d688820..b96d241 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3545,6 +3545,7 @@ package android.app { method public int getLargeMemoryClass(); method public int getLauncherLargeIconDensity(); method public int getLauncherLargeIconSize(); + method public int getLockTaskModeState(); method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); @@ -3555,7 +3556,7 @@ package android.app { method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException; method public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException; method public deprecated java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException; - method public boolean isInLockTaskMode(); + method public deprecated boolean isInLockTaskMode(); method public boolean isLowRamDevice(); method public static boolean isRunningInTestHarness(); method public static boolean isUserAMonkey(); @@ -3563,6 +3564,9 @@ package android.app { method public void moveTaskToFront(int, int); method public void moveTaskToFront(int, int, android.os.Bundle); method public deprecated void restartPackage(java.lang.String); + field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1 + field public static final int LOCK_TASK_MODE_NONE = 0; // 0x0 + field public static final int LOCK_TASK_MODE_PINNED = 2; // 0x2 field public static final java.lang.String META_HOME_ALTERNATE = "android.app.home.alternate"; field public static final int MOVE_TASK_NO_USER_ACTION = 2; // 0x2 field public static final int MOVE_TASK_WITH_HOME = 1; // 0x1 diff --git a/api/system-current.txt b/api/system-current.txt index f06ff1f..65df354 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3633,6 +3633,7 @@ package android.app { method public int getLargeMemoryClass(); method public int getLauncherLargeIconDensity(); method public int getLauncherLargeIconSize(); + method public int getLockTaskModeState(); method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); @@ -3643,7 +3644,7 @@ package android.app { method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException; method public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException; method public deprecated java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException; - method public boolean isInLockTaskMode(); + method public deprecated boolean isInLockTaskMode(); method public boolean isLowRamDevice(); method public static boolean isRunningInTestHarness(); method public static boolean isUserAMonkey(); @@ -3651,6 +3652,9 @@ package android.app { method public void moveTaskToFront(int, int); method public void moveTaskToFront(int, int, android.os.Bundle); method public deprecated void restartPackage(java.lang.String); + field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1 + field public static final int LOCK_TASK_MODE_NONE = 0; // 0x0 + field public static final int LOCK_TASK_MODE_PINNED = 2; // 0x2 field public static final java.lang.String META_HOME_ALTERNATE = "android.app.home.alternate"; field public static final int MOVE_TASK_NO_USER_ACTION = 2; // 0x2 field public static final int MOVE_TASK_WITH_HOME = 1; // 0x1 |