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

Commit 90ee48b6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am:... 

Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am: d1a1c800" into oc-dev-plus-aosp
parents a5abe8f1 161384eb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,7 @@ package android { 
    field public static final int ic_notification_clear_all = 17301594; // 0x108005a

    field public static final int ic_notification_overlay = 17301595; // 0x108005b

    field public static final int ic_partial_secure = 17301596; // 0x108005c

    field public static final int ic_picture_in_picture = 17301685; // 0x10800b5

    field public static final int ic_popup_disk_full = 17301597; // 0x108005d

    field public static final int ic_popup_reminder = 17301598; // 0x108005e

    field public static final int ic_popup_sync = 17301599; // 0x108005f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1834,6 +1834,7 @@ package android { 
    field public static final int ic_notification_clear_all = 17301594; // 0x108005a

    field public static final int ic_notification_overlay = 17301595; // 0x108005b

    field public static final int ic_partial_secure = 17301596; // 0x108005c

    field public static final int ic_picture_in_picture = 17301685; // 0x10800b5

    field public static final int ic_popup_disk_full = 17301597; // 0x108005d

    field public static final int ic_popup_reminder = 17301598; // 0x108005e

    field public static final int ic_popup_sync = 17301599; // 0x108005f

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,7 @@ package android { 
    field public static final int ic_notification_clear_all = 17301594; // 0x108005a

    field public static final int ic_notification_overlay = 17301595; // 0x108005b

    field public static final int ic_partial_secure = 17301596; // 0x108005c

    field public static final int ic_picture_in_picture = 17301685; // 0x10800b5

    field public static final int ic_popup_disk_full = 17301597; // 0x108005d

    field public static final int ic_popup_reminder = 17301598; // 0x108005e

    field public static final int ic_popup_sync = 17301599; // 0x108005f

core/res/res/drawable/ic_picture_in_picture.xml

0 → 100644
+28 −0
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="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M19 11h-8v6h8v-6zm4 8V4.98C23 3.88 22.1 3 21 3H3c-1.1 0-2 .88-2 1.98V19c0 1.1 .9

2 2 2h18c1.1 0 2-.9 2-2zm-2 .02H3V4.97h18v14.05z" />

    <path

        android:pathData="M0 0h24v24H0V0z" />

</vector>
 
 No newline at end of file

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2834,6 +2834,7 @@ 


    <public-group type="drawable" first-id="0x010800b4">

        <public name="autofilled_highlight" />

        <public name="ic_picture_in_picture" />

    </public-group>



    <public-group type="string" first-id="0x01040019">