Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev (8fd30e44) · Commits · e / os / android_frameworks_base

core/res/res/drawable/emulator_circular_window_overlay.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2014 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.
		-->

		<!-- Default to an empty shape drawable -->
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		</shape>

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1611,6 +1611,10 @@
		<!-- default window ShowCircularMask property -->
		<bool name="config_windowShowCircularMask">false</bool>

		<!-- default value for whether circular emulators (ro.emulator.circular)
		should show a display overlay on the screen -->
		<bool name="config_windowEnableCircularEmulatorDisplayOverlay">false</bool>

		<!-- Defines the default set of global actions. Actions may still be disabled or hidden based
		on the current state of the device.
		Each item must be one of the following strings:

core/res/res/values/symbols.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@
		<java-symbol type="bool" name="config_windowIsRound" />
		<java-symbol type="bool" name="config_hasRecents" />
		<java-symbol type="bool" name="config_windowShowCircularMask" />
		<java-symbol type="bool" name="config_windowEnableCircularEmulatorDisplayOverlay" />

		<java-symbol type="integer" name="config_bluetooth_max_advertisers" />
		<java-symbol type="integer" name="config_bluetooth_max_scan_filters" />
		@@ -1155,6 +1156,7 @@
		<java-symbol type="drawable" name="ic_corp_badge" />
		<java-symbol type="drawable" name="ic_corp_icon_badge" />
		<java-symbol type="drawable" name="ic_corp_icon" />
		<java-symbol type="drawable" name="emulator_circular_window_overlay" />

		<java-symbol type="drawable" name="sim_light_blue" />
		<java-symbol type="drawable" name="sim_light_green" />

services/core/java/com/android/server/wm/CircularDisplayMask.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -63,8 +63,14 @@ class CircularDisplayMask {

		SurfaceControl ctrl = null;
		try {
		ctrl = new SurfaceControl(session, "CircularDisplayMask",
		mScreenSize.x, mScreenSize.y, PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN);
		if (WindowManagerService.DEBUG_SURFACE_TRACE) {
		ctrl = new WindowStateAnimator.SurfaceTrace(session, "CircularDisplayMask",
		mScreenSize.x, mScreenSize.y, PixelFormat.TRANSLUCENT,
		SurfaceControl.HIDDEN);
		} else {
		ctrl = new SurfaceControl(session, "CircularDisplayMask", mScreenSize.x,
		mScreenSize.y, PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN);
		}
		ctrl.setLayerStack(display.getLayerStack());
		ctrl.setLayer(zOrder);
		ctrl.setPosition(0, 0);

services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java

0 → 100644

+127 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.server.wm;


		import android.content.Context;
		import android.graphics.Canvas;
		import android.graphics.Color;
		import android.graphics.PixelFormat;
		import android.graphics.Point;
		import android.graphics.PorterDuff;
		import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.util.Slog;
		import android.view.Display;
		import android.view.Surface;
		import android.view.Surface.OutOfResourcesException;
		import android.view.SurfaceControl;
		import android.view.SurfaceSession;

		class EmulatorDisplayOverlay {
		private static final String TAG = "EmulatorDisplayOverlay";

		// Display dimensions
		private Point mScreenSize;

		private final SurfaceControl mSurfaceControl;
		private final Surface mSurface = new Surface();
		private int mLastDW;
		private int mLastDH;
		private boolean mDrawNeeded;
		private Drawable mOverlay;
		private int mRotation;
		private boolean mVisible;

		public EmulatorDisplayOverlay(Context context, Display display, SurfaceSession session,
		int zOrder) {
		mScreenSize = new Point();
		display.getSize(mScreenSize);

		SurfaceControl ctrl = null;
		try {
		if (WindowManagerService.DEBUG_SURFACE_TRACE) {
		ctrl = new WindowStateAnimator.SurfaceTrace(session, "EmulatorDisplayOverlay",
		mScreenSize.x, mScreenSize.y, PixelFormat.TRANSLUCENT,
		SurfaceControl.HIDDEN);
		} else {
		ctrl = new SurfaceControl(session, "EmulatorDisplayOverlay", mScreenSize.x,
		mScreenSize.y, PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN);
		}
		ctrl.setLayerStack(display.getLayerStack());
		ctrl.setLayer(zOrder);
		ctrl.setPosition(0, 0);
		ctrl.show();
		mSurface.copyFrom(ctrl);
		} catch (OutOfResourcesException e) {
		}
		mSurfaceControl = ctrl;
		mDrawNeeded = true;
		mOverlay = context.getDrawable(
		com.android.internal.R.drawable.emulator_circular_window_overlay);
		}

		private void drawIfNeeded() {
		if (!mDrawNeeded \|\| !mVisible) {
		return;
		}
		mDrawNeeded = false;

		Rect dirty = new Rect(0, 0, mScreenSize.x, mScreenSize.y);
		Canvas c = null;
		try {
		c = mSurface.lockCanvas(dirty);
		} catch (IllegalArgumentException e) {
		} catch (OutOfResourcesException e) {
		}
		if (c == null) {
		return;
		}
		c.drawColor(Color.TRANSPARENT, PorterDuff.Mode.SRC);
		mSurfaceControl.setPosition(0, 0);
		mOverlay.setBounds(0, 0, mScreenSize.x, mScreenSize.y);
		mOverlay.draw(c);
		mSurface.unlockCanvasAndPost(c);
		}

		// Note: caller responsible for being inside
		// Surface.openTransaction() / closeTransaction()
		public void setVisibility(boolean on) {
		if (mSurfaceControl == null) {
		return;
		}
		mVisible = on;
		drawIfNeeded();
		if (on) {
		mSurfaceControl.show();
		} else {
		mSurfaceControl.hide();
		}
		}

		void positionSurface(int dw, int dh, int rotation) {
		if (mLastDW == dw && mLastDH == dh && mRotation == rotation) {
		return;
		}
		mLastDW = dw;
		mLastDH = dh;
		mDrawNeeded = true;
		mRotation = rotation;
		drawIfNeeded();
		}

		}