From 33600c9a4e17f4f53be3c53b5663e58ab72a00fe Mon Sep 17 00:00:00 2001 From: Filip Gruszczynski Date: Mon, 14 Dec 2015 15:02:43 -0800 Subject: [PATCH] Sample for launching activity to the side. Also includes changing the name of the sample from caption overlay to general multi window sample directory. Bug: 26141281 Change-Id: I8dca42c4af14b13cf874f0ac1ee6c5fad23aeceb --- .../Android.mk | 2 +- .../AndroidManifest.xml | 24 +++++++++- .../res/layout/caption_overlay_layout.xml | 0 .../res/layout/launching_to_side_layout.xml | 35 +++++++++++++++ .../res/layout/move_task_to_side_layout.xml | 28 ++++++++++++ .../res/values/strings.xml | 3 +- .../multiwindow}/CaptionOverlayActivity.java | 4 +- .../multiwindow/LaunchingToSideActivity.java | 45 +++++++++++++++++++ .../multiwindow/MoveTaskToSideActivity.java | 22 +++++++++ 9 files changed, 157 insertions(+), 6 deletions(-) rename samples/{CaptionOverlayActivity => MultiWindow}/Android.mk (88%) rename samples/{CaptionOverlayActivity => MultiWindow}/AndroidManifest.xml (55%) rename samples/{CaptionOverlayActivity => MultiWindow}/res/layout/caption_overlay_layout.xml (100%) create mode 100644 samples/MultiWindow/res/layout/launching_to_side_layout.xml create mode 100644 samples/MultiWindow/res/layout/move_task_to_side_layout.xml rename samples/{CaptionOverlayActivity => MultiWindow}/res/values/strings.xml (85%) rename samples/{CaptionOverlayActivity/src/com/example/android/captionoverlayactivity => MultiWindow/src/com/example/android/multiwindow}/CaptionOverlayActivity.java (95%) create mode 100644 samples/MultiWindow/src/com/example/android/multiwindow/LaunchingToSideActivity.java create mode 100644 samples/MultiWindow/src/com/example/android/multiwindow/MoveTaskToSideActivity.java diff --git a/samples/CaptionOverlayActivity/Android.mk b/samples/MultiWindow/Android.mk similarity index 88% rename from samples/CaptionOverlayActivity/Android.mk rename to samples/MultiWindow/Android.mk index c4a8c87d7..8827b30cf 100644 --- a/samples/CaptionOverlayActivity/Android.mk +++ b/samples/MultiWindow/Android.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := samples # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := CaptionOverlayActivity +LOCAL_PACKAGE_NAME := MultiWindow LOCAL_SDK_VERSION := current diff --git a/samples/CaptionOverlayActivity/AndroidManifest.xml b/samples/MultiWindow/AndroidManifest.xml similarity index 55% rename from samples/CaptionOverlayActivity/AndroidManifest.xml rename to samples/MultiWindow/AndroidManifest.xml index ff349dfea..229c48e22 100644 --- a/samples/CaptionOverlayActivity/AndroidManifest.xml +++ b/samples/MultiWindow/AndroidManifest.xml @@ -15,9 +15,10 @@ --> - + package="com.example.android.multiwindow"> + @@ -25,5 +26,24 @@ + + + + + + + + + + + + + + diff --git a/samples/CaptionOverlayActivity/res/layout/caption_overlay_layout.xml b/samples/MultiWindow/res/layout/caption_overlay_layout.xml similarity index 100% rename from samples/CaptionOverlayActivity/res/layout/caption_overlay_layout.xml rename to samples/MultiWindow/res/layout/caption_overlay_layout.xml diff --git a/samples/MultiWindow/res/layout/launching_to_side_layout.xml b/samples/MultiWindow/res/layout/launching_to_side_layout.xml new file mode 100644 index 000000000..f389d29a2 --- /dev/null +++ b/samples/MultiWindow/res/layout/launching_to_side_layout.xml @@ -0,0 +1,35 @@ + + + + +