ca2eb0182f
There's a lot of confusing logic where 90 and 270 rotation values need to be flipped to ensure the screenshot is taken the correct orientation. There's also confusion what useIdentityTransform means, especially if a non 0 rotation value is sent. The cases screenshot cares about is the following: 1. Take screenshot in current display orientation 2. Take screenshot with 0 rotation so the caller can handle rotating the screenshot themselves. With these two cases in mind, remove the rotation value passed in for screenshots. If useIdentityTransform is true, it will rotate the screenshot so it's in the 0 orientation. If useIdentityTransform is false, it will use the current display rotation. This simplifies the caller logic since they no longer have to find the current display rotation to ensure the screenshot is taken in the current rotation. The callers can just request the screenshot with useIdentityTransform set to false. Test: adb shell screencap Test: Power + volume screenshot Test: Screen rotation Fixes: 135942984 Change-Id: I3435ee8b5dac05e910ec1e695f398c5dcdcff9e9
60 lines
2.0 KiB
Java
60 lines
2.0 KiB
Java
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.shell;
|
|
|
|
import android.graphics.Bitmap;
|
|
import android.os.IBinder;
|
|
import android.util.Log;
|
|
import android.view.SurfaceControl;
|
|
|
|
/**
|
|
* Helper class used to take screenshots.
|
|
*
|
|
* TODO: logic below was copied and pasted from UiAutomation; it should be refactored into a common
|
|
* component that could be used by both (Shell and UiAutomation).
|
|
*/
|
|
final class Screenshooter {
|
|
|
|
private static final String TAG = "Screenshooter";
|
|
|
|
/**
|
|
* Takes a screenshot.
|
|
*
|
|
* @return The screenshot bitmap on success, null otherwise.
|
|
*/
|
|
static Bitmap takeScreenshot() {
|
|
Log.d(TAG, "Taking fullscreen screenshot");
|
|
// Take the screenshot
|
|
final IBinder displayToken = SurfaceControl.getInternalDisplayToken();
|
|
final SurfaceControl.DisplayCaptureArgs captureArgs =
|
|
new SurfaceControl.DisplayCaptureArgs.Builder(displayToken)
|
|
.build();
|
|
final SurfaceControl.ScreenshotHardwareBuffer screenshotBuffer =
|
|
SurfaceControl.captureDisplay(captureArgs);
|
|
final Bitmap screenShot = screenshotBuffer == null ? null : screenshotBuffer.asBitmap();
|
|
if (screenShot == null) {
|
|
Log.e(TAG, "Failed to take fullscreen screenshot");
|
|
return null;
|
|
}
|
|
|
|
// Optimization
|
|
screenShot.setHasAlpha(false);
|
|
|
|
return screenShot;
|
|
}
|
|
}
|