summaryrefslogtreecommitdiffstats
path: root/policy/src/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-03-14 10:38:05 -0700
committerDianne Hackborn <hackbod@google.com>2012-03-14 12:57:14 -0700
commita4972e951bf2bdb7afdafee95b3ab0c15b8bacae (patch)
tree9800a9dcd62d945a8ad71549ebcef70393ef5442 /policy/src/com
parent89ea4ca9c26f3c7e365525a0b83500e85517a457 (diff)
downloadframeworks_base-a4972e951bf2bdb7afdafee95b3ab0c15b8bacae.zip
frameworks_base-a4972e951bf2bdb7afdafee95b3ab0c15b8bacae.tar.gz
frameworks_base-a4972e951bf2bdb7afdafee95b3ab0c15b8bacae.tar.bz2
Add new "options" argument to all startActivity APIs.
This will be used to allow new features to be requested... such as, say, a special kind of animation. Right now there are no options defined. Change-Id: I4eb6f27275cdd4bf186f6da316ab93a2372ad4b7
Diffstat (limited to 'policy/src/com')
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index e0a0d2d..a1f7316 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -17,8 +17,8 @@
package com.android.internal.policy.impl;
import android.app.Activity;
+import android.app.ActivityManager;
import android.app.ActivityManagerNative;
-import android.app.IActivityManager;
import android.app.IUiModeManager;
import android.app.ProgressDialog;
import android.app.UiModeManager;
@@ -3832,10 +3832,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
int result = ActivityManagerNative.getDefault()
.startActivity(null, dock,
dock.resolveTypeIfNeeded(mContext.getContentResolver()),
- null, 0, null, null, 0, true /* onlyIfNeeded*/,
- false /* debug */, false /* openglTrace */,
- null, null, false);
- if (result == IActivityManager.START_RETURN_INTENT_TO_CALLER) {
+ null, null, 0,
+ ActivityManager.START_FLAG_ONLY_IF_NEEDED,
+ null, null, null);
+ if (result == ActivityManager.START_RETURN_INTENT_TO_CALLER) {
return false;
}
}
@@ -3843,10 +3843,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
int result = ActivityManagerNative.getDefault()
.startActivity(null, mHomeIntent,
mHomeIntent.resolveTypeIfNeeded(mContext.getContentResolver()),
- null, 0, null, null, 0, true /* onlyIfNeeded*/,
- false /* debug */, false /* openglTrace */,
- null, null, false);
- if (result == IActivityManager.START_RETURN_INTENT_TO_CALLER) {
+ null, null, 0,
+ ActivityManager.START_FLAG_ONLY_IF_NEEDED,
+ null, null, null);
+ if (result == ActivityManager.START_RETURN_INTENT_TO_CALLER) {
return false;
}
} catch (RemoteException ex) {