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

Commit 5a26eabe authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "PIP: Apply the new UX spec for PIP in Recents" into nyc-dev 

am: 00b41d18

* commit '00b41d18':
  PIP: Apply the new UX spec for PIP in Recents
parents 0d94716b 00b41d18

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

+0 −8
Original line number Diff line number Diff line
@@ -26,12 +26,4 @@ 


    <!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->

    <string translatable="false" name="config_defaultPictureInPictureBounds">"1328 54 1808 324"</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">"596 280 1324 690"</string>



    <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows,

         when the PIP is shown with Recents. -->

    <string translatable="false" name="config_pictureInPictureBoundsInRecents">"1484 96 1804 276"</string>

</resources>

core/res/res/values/config.xml

+0 −8
Original line number Diff line number Diff line
@@ -2465,14 +2465,6 @@ 
    <!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->

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



    <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows,

         when the PIP is shown with Recents. -->

    <string translatable="false" name="config_pictureInPictureBoundsInRecents">"0 0 100 100"</string>



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

             1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -308,8 +308,6 @@ 
  <java-symbol type="bool" name="config_guestUserEphemeral" />

  <java-symbol type="bool" name="config_localDisplaysMirrorContent" />

  <java-symbol type="string" name="config_defaultPictureInPictureBounds" />

  <java-symbol type="string" name="config_centeredPictureInPictureBounds" />

  <java-symbol type="string" name="config_pictureInPictureBoundsInRecents" />

  <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_penalty_threshold" />

packages/SystemUI/res/anim/tv_pip_controls_fade_in.xml

0 → 100644
+29 −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.

-->



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



    <objectAnimator

        android:propertyName="translationY"

        android:valueTo="10dp"

        android:interpolator="@android:interpolator/linear_out_slow_in"

        android:duration="@integer/recents_tv_pip_focus_anim_duration" />

    <objectAnimator

        android:propertyName="alpha"

        android:valueTo="1.0"

        android:interpolator="@android:interpolator/linear_out_slow_in"

        android:duration="@integer/recents_tv_pip_focus_anim_duration" />

</set>

packages/SystemUI/res/anim/tv_pip_controls_fade_out.xml

0 → 100644
+29 −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.

-->



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



    <objectAnimator

        android:propertyName="translationY"

        android:valueTo="0dp"

        android:interpolator="@android:interpolator/fast_out_linear_in"

        android:duration="@integer/recents_tv_pip_focus_anim_duration" />

    <objectAnimator

        android:propertyName="alpha"

        android:valueTo="0.0"

        android:interpolator="@android:interpolator/fast_out_linear_in"

        android:duration="@integer/recents_tv_pip_focus_anim_duration" />

</set>