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

Commit 3a35c553 authored by Wenbo Jie (介文博)'s avatar Wenbo Jie (介文博) Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI] Remove "Images" shortcut" into main

parents b0ee5fd7 0596babc

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ 
                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.APP_FILES" />

            </intent-filter>

            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />

        </activity-alias>



        <activity

res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_images_shortcut.xml

deleted100644 → 0
+0 −33
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.

  -->



<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@color/shortcut_background" />

    <foreground>

      <inset android:inset="33%">

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

          android:width="24dp"

          android:height="24dp"

          android:viewportHeight="24"

          android:viewportWidth="24">

        <path

          android:fillColor="@color/shortcut_foreground"

          android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z" />

        </vector>

      </inset>

    </foreground>

</adaptive-icon>

res/flag(com.android.documentsui.flags.use_material3)/drawable/ic_images_shortcut.xml

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

<!--

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

  -->



<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@color/shortcut_background" />

    <foreground>

      <inset android:inset="33%">

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

          android:width="24dp"

          android:height="24dp"

          android:viewportHeight="24"

          android:viewportWidth="24">

        <path

          android:fillColor="@color/shortcut_foreground"

          android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z" />

        </vector>

      </inset>

    </foreground>

</adaptive-icon>

res/xml/shortcuts.xml

deleted100644 → 0
+0 −27
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.

  -->



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

    <shortcut

        android:shortcutId="content://com.android.providers.media.documents/root/images_root"

        android:icon="@drawable/ic_images_shortcut"

        android:shortcutShortLabel="@string/images_shortcut_label" >

        <intent

            android:action="android.intent.action.VIEW"

            android:data="content://com.android.providers.media.documents/root/images_root" />

    </shortcut>

</shortcuts>
 
 No newline at end of file