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

Commit ea650c5c authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Android (Google) Code Review
Browse files

Merge "Tv pip menu design update (1)"

parents 1ce5b9c1 1eeea7c0

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,11 +27,11 @@ 
    <!-- The percentage of the screen width to use for the default width or height of

    <!-- The percentage of the screen width to use for the default width or height of

         picture-in-picture windows. Regardless of the percent set here, calculated size will never

         picture-in-picture windows. Regardless of the percent set here, calculated size will never

         be smaller than @dimen/default_minimal_size_pip_resizable_task. -->

         be smaller than @dimen/default_minimal_size_pip_resizable_task. -->

    <item name="config_pictureInPictureDefaultSizePercent" format="float" type="dimen">0.14</item>

    <item name="config_pictureInPictureDefaultSizePercent" format="float" type="dimen">0.2</item>





    <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows.

    <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows.

         These values are in DPs and will be converted to pixel sizes internally. -->

         These values are in DPs and will be converted to pixel sizes internally. -->

    <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">56x27</string>

    <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">24x24</string>





    <!-- The default gravity for the picture-in-picture window.

    <!-- The default gravity for the picture-in-picture window.

         Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT -->

         Currently, this maps to Gravity.BOTTOM | Gravity.RIGHT -->

libs/WindowManager/Shell/res/color/tv_pip_menu_icon.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->

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

    <item android:state_focused="true"

          android:color="@color/tv_pip_menu_icon_focused" />

    <item android:state_enabled="false"

          android:color="@color/tv_pip_menu_icon_disabled" />

    <item android:color="@color/tv_pip_menu_icon_unfocused" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/color/tv_pip_menu_icon_bg.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->

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

    <item android:state_focused="true"

          android:color="@color/tv_pip_menu_icon_bg_focused" />

    <item android:color="@color/tv_pip_menu_icon_bg_unfocused" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/tv_pip_button_focused.xml→libs/WindowManager/Shell/res/drawable/tv_pip_button_bg.xml

+5 −2
Original line number Original line Diff line number Diff line
@@ -14,5 +14,8 @@ 
    See the License for the specific language governing permissions and

    See the License for the specific language governing permissions and

    limitations under the License.

    limitations under the License.

-->

-->

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

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

    android:color="#9AFFFFFF" android:radius="17dp" />
 
       android:shape="rectangle">

    <corners android:radius="@dimen/pip_menu_button_radius" />

    <solid android:color="@color/tv_pip_menu_icon_bg" />

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/tv_pip_menu_border.xml

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

<!--

  ~ Copyright (C) 2021 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="rectangle">

    <corners android:radius="@dimen/pip_menu_border_radius" />

    <stroke android:width="@dimen/pip_menu_border_width"

            android:color="@color/tv_pip_menu_focus_border" />

</shape>
 
 No newline at end of file