Merge "Showing docked stack divider window." (ab6fc9eb) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ public interface WindowManager extends ViewManager {
		@ViewDebug.IntToString(from = TYPE_PRIVATE_PRESENTATION, to = "TYPE_PRIVATE_PRESENTATION"),
		@ViewDebug.IntToString(from = TYPE_VOICE_INTERACTION, to = "TYPE_VOICE_INTERACTION"),
		@ViewDebug.IntToString(from = TYPE_VOICE_INTERACTION_STARTING, to = "TYPE_VOICE_INTERACTION_STARTING"),
		@ViewDebug.IntToString(from = TYPE_DOCK_DIVIDER, to = "TYPE_DOCK_DIVIDER"),
		})
		public int type;

		@@ -564,6 +565,13 @@ public interface WindowManager extends ViewManager {
		*/
		public static final int TYPE_VOICE_INTERACTION_STARTING = FIRST_SYSTEM_WINDOW+33;

		/**
		* Window for displaying a handle used for resizing docked stacks. This window is owned
		* by the system process.
		* @hide
		*/
		public static final int TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW+34;

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

0 → 100644

+21 −0

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

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="@dimen/docked_stack_divider_thickness"
		android:layout_height="match_parent"
		android:background="@android:color/black"
		/>

+3 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,9 @@
		<!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
		<dimen name="status_bar_edge_ignore">5dp</dimen>

		<!-- Width of a divider bar used to resize docked stacks. -->
		<dimen name="docked_stack_divider_thickness">24dp</dimen>

		<!-- Min width for a tablet device -->
		<dimen name="min_xlarge_screen_width">800dp</dimen>

+2 −0

Original line number	Diff line number	Diff line
		@@ -1477,6 +1477,7 @@
		<java-symbol type="bool" name="config_showNavigationBar" />
		<java-symbol type="bool" name="config_supportAutoRotation" />
		<java-symbol type="bool" name="target_honeycomb_needs_options_menu" />
		<java-symbol type="dimen" name="docked_stack_divider_thickness" />
		<java-symbol type="dimen" name="navigation_bar_height" />
		<java-symbol type="dimen" name="navigation_bar_height_landscape" />
		<java-symbol type="dimen" name="navigation_bar_width" />
		@@ -1719,6 +1720,7 @@
		<java-symbol type="integer" name="config_undockedHdmiRotation" />
		<java-symbol type="integer" name="config_virtualKeyQuietTimeMillis" />
		<java-symbol type="layout" name="am_compat_mode_dialog" />
		<java-symbol type="layout" name="docked_stack_divider" />
		<java-symbol type="layout" name="launch_warning" />
		<java-symbol type="layout" name="safe_mode" />
		<java-symbol type="layout" name="simple_list_item_2_single_choice" />

+4 −3

Original line number	Diff line number	Diff line
		@@ -3217,7 +3217,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		case WindowManager.LayoutParams.TYPE_SYSTEM_ALERT:
		case WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG:
		case WindowManager.LayoutParams.TYPE_SYSTEM_ERROR:
		case WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY: {
		case WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY:
		case WindowManager.LayoutParams.TYPE_DOCK_DIVIDER: {
		return AccessibilityWindowInfo.TYPE_SYSTEM;
		}