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

Commit b77380f6 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Deprecate pip-to-split function" into main

parents cb3aab75 b56e8f2e
Loading
Loading
Loading
Loading
+0 −27
Original line number 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.
  -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="@dimen/pip_expand_action_inner_size"
        android:height="@dimen/pip_expand_action_inner_size"
        android:viewportWidth="24"
        android:viewportHeight="24">

    <path
        android:fillColor="#FFFFFF"
        android:pathData="M20,18h-5V6h5V18z M22,18V6c0-1.1-0.9-2-2-2h-5c-1.1,0-2,0.9-2,2v12c0,1.1,0.9,2,2,2h5C21.1,20,22,19.1,22,18z M9,18H4V6h5
		V18z M11,18V6c0-1.1-0.9-2-2-2H4C2.9,4,2,4.9,2,6v12c0,1.1,0.9,2,2,2h5C10.1,20,11,19.1,11,18z" />
</vector>
+0 −10
Original line number Diff line number Diff line
@@ -79,16 +79,6 @@
            android:src="@drawable/pip_ic_settings"
            android:background="?android:selectableItemBackgroundBorderless" />

        <ImageButton
            android:id="@+id/enter_split"
            android:layout_width="@dimen/pip_split_icon_size"
            android:layout_height="@dimen/pip_split_icon_size"
            android:layout_gravity="top|start"
            android:layout_margin="@dimen/pip_split_icon_margin"
            android:gravity="center"
            android:contentDescription="@string/pip_phone_enter_split"
            android:src="@drawable/pip_split"
            android:background="?android:selectableItemBackgroundBorderless" />
    </LinearLayout>

    <!--TODO (b/156917828): Add content description for a11y purposes?-->
+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@
    <!-- PiP minimum size, which is a % based off the shorter side of display width and height -->
    <fraction name="config_pipShortestEdgePercent">40%</fraction>

    <!-- Show PiP enter split icon, which allows apps to directly enter splitscreen from PiP. -->
    <bool name="config_pipEnableEnterSplitButton">false</bool>

    <!-- Time (duration in milliseconds) that the shell waits for an app to close the PiP by itself
         if a custom action is present before closing it. -->
    <integer name="config_pipForceCloseDelay">1000</integer>
+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@
    <dimen name="pip_resize_handle_margin">4dp</dimen>
    <dimen name="pip_resize_handle_padding">0dp</dimen>

    <!-- PIP Split icon size and margin. -->
    <dimen name="pip_split_icon_size">24dp</dimen>
    <dimen name="pip_split_icon_margin">12dp</dimen>

    <!-- PIP stash offset size, which is the width of visible PIP region when stashed. -->
    <dimen name="pip_stash_offset">32dp</dimen>

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@
    <!-- Label for PIP settings button [CHAR LIMIT=NONE]-->
    <string name="pip_phone_settings">Settings</string>

    <!-- Label for the PIP enter split button [CHAR LIMIT=NONE] -->
    <string name="pip_phone_enter_split">Enter split screen</string>

    <!-- Title of menu shown over picture-in-picture. Used for accessibility. -->
    <string name="pip_menu_title">Menu</string>

Loading