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

Commit 73bc159d authored by Winson's avatar Winson Committed by Winson Chung
Browse files

Adding PIP logic for phones. 

- Adding basic behavior to move PIP window and launch back into
  fullscreen, as well as drag it to dismiss.

Test: Deferring CTS tests as this interaction is only temporary and not
      final

Change-Id: I5272a045090c20c45b345813d10dc385c3f83221
parent 4e0b3174

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/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -694,4 +694,7 @@ 


    <!-- The alpha to apply to the recents row when it doesn't have focus -->

    <item name="recents_recents_row_dim_alpha" format="float" type="dimen">0.5</item>



    <!-- The size of the PIP dismiss target. -->

    <dimen name="pip_dismiss_target_size">48dp</dimen>

</resources>

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import com.android.systemui.stackdivider.Divider; 
import com.android.systemui.statusbar.SystemBars;

import com.android.systemui.statusbar.phone.PhoneStatusBar;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tv.pip.PipUI;

import com.android.systemui.pip.PipUI;

import com.android.systemui.usb.StorageNotification;

import com.android.systemui.volume.VolumeUI;