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

Merge "Adding actions to non client decor buttons"

Browse Source
This commit is contained in:
Stefan Kuhne
2015-08-07 22:11:30 +00:00
committed by Android (Google) Code Review
parent 736716af43 1b42057707
commit c6feec0453
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/Window.java
View File

@@ -675,9 +675,9 @@ public abstract class Window {
}
/** @hide */
public final void dispatchOnWindowDismissed() {
public final void dispatchOnWindowDismissed(boolean finishTask) {
if (mOnWindowDismissedCallback != null) {
mOnWindowDismissedCallback.onWindowDismissed(false);
mOnWindowDismissedCallback.onWindowDismissed(finishTask);
}
}

2
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -4403,7 +4403,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
swipeDismiss.setOnDismissedListener(new SwipeDismissLayout.OnDismissedListener() {
@Override
public void onDismissed(SwipeDismissLayout layout) {
dispatchOnWindowDismissed();
dispatchOnWindowDismissed(false /*finishTask*/);
}
});
swipeDismiss.setOnSwipeProgressChangedListener(

34
core/java/com/android/internal/widget/NonClientDecorView.java
View File

@@ -16,9 +16,6 @@
package com.android.internal.widget;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo;
import android.app.ActivityManagerNative;
import android.content.Context;
import android.os.RemoteException;
import android.util.AttributeSet;
@@ -29,11 +26,10 @@ import android.util.TypedValue;
import android.view.ViewOutlineProvider;
import android.view.WindowInsets;
import android.view.Window;
import com.android.internal.R;
import com.android.internal.policy.PhoneWindow;
import java.util.List;
/**
* This class represents the special screen elements to control a window on free form
* environment. All thse screen elements are added in the "non client area" which is the area of
@@ -106,20 +102,9 @@ public class NonClientDecorView extends ViewGroup implements View.OnClickListene
@Override
public void onClick(View view) {
if (view.getId() == R.id.maximize_window) {
// TODO(skuhne): Add code to maximize window.
maximizeWindow();
} else if (view.getId() == R.id.close_window) {
// TODO(skuhne): This is not the right way to kill an app and we should add a high level
// function for it.
final ActivityManager m =
(ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE);
List<RunningTaskInfo> runningTaskInfoList = m.getRunningTasks(1);
if (!runningTaskInfoList.isEmpty()) {
try {
ActivityManagerNative.getDefault().removeTask(runningTaskInfoList.get(0).id);
} catch (RemoteException ex) {
Log.e(TAG, "Couldn't close task with the close button.");
}
}
mOwner.dispatchOnWindowDismissed(true /*finishTask*/);
}
}
@@ -216,4 +201,17 @@ public class NonClientDecorView extends ViewGroup implements View.OnClickListene
return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dip,
getResources().getDisplayMetrics());
}
// Maximize the window by moving it to the maximize stack.
private void maximizeWindow() {
Window.WindowStackCallback callback = mOwner.getWindowStackCallback();
if (callback != null) {
try {
callback.changeWindowStack(
android.app.ActivityManager.FULLSCREEN_WORKSPACE_STACK_ID);
} catch (RemoteException ex) {
Log.e(TAG, "Cannot change task workspace.");
}
}
}
}