Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba157d91 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes I4ca1f68d,I5272a045 

* changes:
  Moving TV PIP logic to the PIP sub package.
  Adding PIP logic for phones.
parents 81769558 bf8c2c0f

packages/SystemUI/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ 


        <!-- started from PipUI -->

        <activity

            android:name="com.android.systemui.tv.pip.PipMenuActivity"

            android:name=".pip.tv.PipMenuActivity"

            android:exported="true"

            android:theme="@style/PipTheme"

            android:launchMode="singleTop"
@@ -400,7 +400,7 @@ 
            androidprv:alwaysFocusable="true"

            android:excludeFromRecents="true" />

        <activity

            android:name="com.android.systemui.tv.pip.PipOverlayActivity"

            android:name=".pip.tv.PipOverlayActivity"

            android:exported="true"

            android:theme="@style/PipTheme"

            android:taskAffinity=""
@@ -409,7 +409,7 @@ 
            android:supportsPictureInPicture="true"

            android:excludeFromRecents="true" />

        <activity

            android:name="com.android.systemui.tv.pip.PipOnboardingActivity"

            android:name=".pip.tv.PipOnboardingActivity"

            android:exported="true"

            android:theme="@style/PipTheme"

            android:launchMode="singleTop"

packages/SystemUI/res/drawable/pip_dismiss.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="42.0dp"

        android:height="42.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M38.000000,12.800000l-2.799999,-2.800000 -11.200001,11.200001 -11.200000,-11.200001 -2.800000,2.800000 11.200001,11.200000 -11.200001,11.200001 2.800000,2.799999 11.200000,-11.200001 11.200001,11.200001 2.799999,-2.799999 -11.200001,-11.200001z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/pip_dismiss_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<!--

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.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    <corners

        android:radius="100dp" />

    <solid

        android:color="#66000000" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/pip_dismiss_view.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/pip_dismiss_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/pip_dismiss_background"

    android:foreground="@drawable/pip_dismiss"

    android:alpha="0"

    android:forceHasOverlappingRendering="false" />

packages/SystemUI/res/layout/tv_pip_control_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
*/

-->



<!-- Layout for {@link com.android.systemui.tv.pip.PipControlButtonView}. -->

<!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. -->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <ImageView android:id="@+id/button"