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

Commit 54a3d22c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updating expand icon asset." into oc-dev

parents daf0506f 9a352b60

packages/SystemUI/res/drawable/pip_expand_ll.xml→packages/SystemUI/res/drawable/pip_expand.xml

+29 −0
Original line number Diff line number Diff line
@@ -15,20 +15,15 @@ Copyright (C) 2017 The Android Open Source Project 
    limitations under the License.

-->

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

    android:width="60dp"

    android:height="60dp"

    android:viewportWidth="60"

    android:viewportHeight="60">

    android:width="36dp"

    android:height="36dp"

    android:viewportWidth="36"

    android:viewportHeight="36">



    <path

        android:fillColor="#fff"

        android:pathData="M7.5,52h45a5,5,0,0,0,5-5V12.95A5,5,0,0,0,52.5,8H7.5a5,5,0,0,0-5,4.95V47A5,5,0,0,0,7.5,52Zm-1-5V13a1,1,0,0,1,1-1h45a1,1,0,0,1,1,1V47a1,1,0,0,1-1,1H7.5A1,1,0,0,1,6.5,47Z" />

        android:pathData="M0 0h36v36H0z" />

    <path

        android:pathData="M0,0V60H60V0H0Z" />

    <path

        android:fillColor="#fff"

        android:pathData="M35,39.14v2a1,1,0,0,0,1,1H46.5a1,1,0,0,0,1-1V30.64a1,1,0,0,0-1-1h-2a1,1,0,0,0-1,1v7.5H36A1,1,0,0,0,35,39.14Z" />

    <path

        android:fillColor="#fff"

        android:pathData="M13.5,30.36h2a1,1,0,0,0,1-1v-7.5H24a1,1,0,0,0,1-1v-2a1,1,0,0,0-1-1H13.5a1,1,0,0,0-1,1v10.5A1,1,0,0,0,13.5,30.36Z" />

        android:fillColor="#FFFFFF"

        android:pathData="M10 21H7v8h8v-3h-5v-5zm-3-6h3v-5h5V7H7v8zm19 11h-5v3h8v-8h-3v5zM21

7v3h5v5h3V7h-8z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/pip_expand_lr.xml

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

<!--

Copyright (C) 2017 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="60dp"

    android:height="60dp"

    android:viewportWidth="60"

    android:viewportHeight="60">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M57.5,47V12.95c0-2.75-2.25-4.95-5-4.95h-45c-2.75,0-5,2.2-5,4.95V47c0,2.75,2.25,5,5,5h45

C55.25,52,57.5,49.75,57.5,47z

M52.5,48h-45c-0.55,0-1-0.45-1-1V13c0-0.55,0.45-1,1-1h45c0.55,0,1,0.45,1,1v34

C53.5,47.55,53.05,48,52.5,48z" />

    <path

        android:pathData="M60,0v60H0L0,0L60,0z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M25,39.14v2c0,0.55-0.45,1-1,1H13.5c-0.55,0-1-0.45-1-1v-10.5c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1v7.5

H24C24.55,38.14,25,38.59,25,39.14z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M46.5,30.36h-2c-0.55,0-1-0.45-1-1v-7.5H36c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h10.5

c0.55,0,1,0.45,1,1v10.5C47.5,29.91,47.05,30.36,46.5,30.36z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/pip_expand_pl.xml

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

<!--

Copyright (C) 2017 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="60dp"

    android:height="60dp"

    android:viewportWidth="60"

    android:viewportHeight="60">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M47,2.5H12.95C10.2,2.5,8,4.75,8,7.5v45c0,2.75,2.2,5,4.95,5H47c2.75,0,5-2.25,5-5v-45

C52,4.75,49.75,2.5,47,2.5z

M48,7.5v45c0,0.55-0.45,1-1,1H13c-0.55,0-1-0.45-1-1v-45c0-0.55,0.45-1,1-1h34

C47.55,6.5,48,6.95,48,7.5z" />

    <path

        android:pathData="M0,0l60,0v60H0L0,0z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M39.14,35h2c0.55,0,1,0.45,1,1v10.5c0,0.55-0.45,1-1,1h-10.5c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h7.5

V36C38.14,35.45,38.59,35,39.14,35z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M30.36,13.5v2c0,0.55-0.45,1-1,1h-7.5V24c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V13.5c0-0.55,0.45-1,1-1

h10.5C29.91,12.5,30.36,12.95,30.36,13.5z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/pip_expand_pr.xml

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

<!--

Copyright (C) 2017 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="60dp"

    android:height="60dp"

    android:viewportWidth="60"

    android:viewportHeight="60">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M8,7.5v45c0,2.75,2.25,5,5,5h34.05c2.75,0,4.95-2.25,4.95-5v-45c0-2.75-2.2-5-4.95-5H13

C10.25,2.5,8,4.75,8,7.5z

M13,6.5h34c0.55,0,1,0.45,1,1v45c0,0.55-0.45,1-1,1H13c-0.55,0-1-0.45-1-1v-45C12,6.95,12.45,6.5,13,6.5z" />

    <path

        android:pathData="M60,0L0,0l0,60h60V0z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M20.86,35h-2c-0.55,0-1,0.45-1,1v10.5c0,0.55,0.45,1,1,1h10.5c0.55,0,1-0.45,1-1v-2c0-0.55-0.45-1-1-1h-7.5

V36C21.86,35.45,21.41,35,20.86,35z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M29.64,13.5v2c0,0.55,0.45,1,1,1h7.5V24c0,0.55,0.45,1,1,1h2c0.55,0,1-0.45,1-1V13.5c0-0.55-0.45-1-1-1

h-10.5C30.09,12.5,29.64,12.95,29.64,13.5z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/pip_menu_activity.xml

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
              android:layout_height="60dp"

              android:layout_gravity="center"

              android:contentDescription="@string/pip_phone_expand"

              android:padding="10dp"

              android:src="@drawable/pip_expand"

              android:background="?android:selectableItemBackgroundBorderless" />

      </FrameLayout>