Merge "Use two fingers to work some magic..." (0e5416f6) · Commits · e / os / android_frameworks_base

core/java/android/view/IWindowSession.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -172,4 +172,7 @@ interface IWindowSession {
		int z, in Bundle extras, boolean sync);

		void wallpaperCommandComplete(IBinder window, in Bundle result);

		void setUniverseTransform(IBinder window, float alpha, float offx, float offy,
		float dsdx, float dtdx, float dsdy, float dtdy);
		}

core/java/android/view/WindowManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,12 @@ public interface WindowManager extends ViewManager {
		*/
		public static final int TYPE_NAVIGATION_BAR_PANEL = FIRST_SYSTEM_WINDOW+24;

		/**
		* Window type: Behind the universe of the real windows.
		* @hide
		*/
		public static final int TYPE_UNIVERSE_BACKGROUND = FIRST_SYSTEM_WINDOW+25;

		/**
		* End of types of system windows.
		*/

core/java/android/view/WindowManagerPolicy.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -554,6 +554,13 @@ public interface WindowManagerPolicy {
		*/
		public int getMaxWallpaperLayer();

		/**
		* Return the window layer at which windows appear above the normal
		* universe (that is no longer impacted by the universe background
		* transform).
		*/
		public int getAboveUniverseLayer();

		/**
		* Return true if the policy desires a full unified system nav bar. Otherwise,
		* it is a phone-style status bar with optional nav bar.

packages/SystemUI/res/layout/universe.xml

0 → 100644

+39 −0

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

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent" android:layout_height="match_parent">
		<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
		android:src="@drawable/bugdroid" android:scaleType="center" />

		<Button android:id="@+id/close"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:layout_alignParentTop="true" android:layout_alignParentRight="true"
		android:text="@string/close_universe" />

		<TextView android:id="@+id/title"
		android:layout_width="match_parent" android:layout_height="wrap_content"
		android:layout_below="@id/close" android:layout_centerHorizontal="true"
		android:paddingBottom="16dp"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:gravity="center" />

		<ImageView android:id="@+id/bottom"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:layout_below="@id/title" android:layout_centerHorizontal="true"
		android:layout_marginTop="16dp" />
		</RelativeLayout>

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,9 @@
		application -->
		<string name="status_bar_notification_inspect_item_title">App info</string>

		<!-- [CHAR LIMIT=NONE] -->
		<string name="close_universe">Close</string>

		<!-- Title for the pseudo-notification shown when notifications are disabled (do-not-disturb
		mode) -->
		<string name="notifications_off_title">Notifications off</string>