Merge "Initial check-in of picture-in-picture system-ui" (d7358f54) · Commits · e / os / android_frameworks_base

core/res/res/values-television/config.xml

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,4 +23,12 @@

	<!-- Flags enabling default window features. See Window.java -->		<!-- Flags enabling default window features. See Window.java -->
	<bool name="config_defaultWindowFeatureOptionsPanel">false</bool>		<bool name="config_defaultWindowFeatureOptionsPanel">false</bool>

			<!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->
			<string translatable="false" name="config_defaultPictureInPictureBounds">"1420 100 1820 325"</string>

			<!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows, when the PIP
			is located in center. -->
			<string translatable="false" name="config_centeredPictureInPictureBounds">"600 331 1320 749"</string>

	</resources>		</resources>

core/res/res/values/config.xml

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2419,6 +2419,10 @@
	<!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->		<!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->
	<string translatable="false" name="config_defaultPictureInPictureBounds">"0 0 100 100"</string>		<string translatable="false" name="config_defaultPictureInPictureBounds">"0 0 100 100"</string>

			<!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows, when the PIP
			is located in center. -->
			<string translatable="false" name="config_centeredPictureInPictureBounds">"0 0 300 300"</string>

	<!-- Controls the snap mode for the docked stack divider		<!-- Controls the snap mode for the docked stack divider
	0 - 3 snap targets: left/top has 16:9 ratio, 1:1, and right/bottom has 16:9 ratio		0 - 3 snap targets: left/top has 16:9 ratio, 1:1, and right/bottom has 16:9 ratio
	1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)		1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)

core/res/res/values/symbols.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -305,6 +305,7 @@
	<java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />		<java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />
	<java-symbol type="bool" name="config_freeformWindowManagement" />		<java-symbol type="bool" name="config_freeformWindowManagement" />
	<java-symbol type="string" name="config_defaultPictureInPictureBounds" />		<java-symbol type="string" name="config_defaultPictureInPictureBounds" />
			<java-symbol type="string" name="config_centeredPictureInPictureBounds" />
	<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />		<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />
	<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />		<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />
	<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" />		<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" />

packages/SystemUI/AndroidManifest.xml

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -309,6 +309,27 @@
	android:launchMode="singleTop"		android:launchMode="singleTop"
	android:excludeFromRecents="true" />		android:excludeFromRecents="true" />

			<!-- started from PipUI -->
			<activity
			android:name="com.android.systemui.tv.pip.PipMenuActivity"
			android:exported="true"
			android:theme="@style/PipTheme"
			android:launchMode="singleTop"
			android:configChanges="screenSize\|smallestScreenSize\|screenLayout\|orientation\|layoutDirection"
			android:resizeable="true"
			android:supportsPictureInPicture="true"
			androidprv:alwaysFocusable="true"
			android:excludeFromRecents="true" />
			<activity
			android:name="com.android.systemui.tv.pip.PipOverlayActivity"
			android:exported="true"
			android:theme="@style/PipTheme"
			android:launchMode="singleTop"
			android:configChanges="screenSize\|smallestScreenSize\|screenLayout\|orientation\|layoutDirection"
			android:resizeable="true"
			android:supportsPictureInPicture="true"
			android:excludeFromRecents="true" />

	<!-- platform logo easter egg activity -->		<!-- platform logo easter egg activity -->
	<activity		<activity
	android:name=".DessertCase"		android:name=".DessertCase"

packages/SystemUI/res/layout/tv_pip_menu.xml

0 → 100644

+61 −0

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

			<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="match_parent"
			android:layout_height="match_parent">
			<FrameLayout
			android:layout_alignParentEnd="true"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:paddingStart="10dp"
			android:paddingEnd="10dp"
			android:background="#88FFFFFF">
			<LinearLayout
			android:orientation="vertical"
			android:layout_gravity="center_vertical"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content" >

			<Button android:id="@+id/full"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_gravity="center_vertical"
			android:text="@string/pip_fullscreen"
			android:textSize="10sp"
			android:focusable="true" />

			<Button android:id="@+id/exit"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_gravity="center_vertical"
			android:text="@string/pip_exit"
			android:textSize="10sp"
			android:focusable="true" />

			<Button android:id="@+id/cancel"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_gravity="center_vertical"
			android:text="@string/pip_cancel"
			android:textSize="10sp"
			android:focusable="true" />
			</LinearLayout>
			</FrameLayout>
			</RelativeLayout>