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

Commit 43bb4255 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid duplicate drawable ids for the global actions icons" into main

parents 97a845b6 7c2da8d4

packages/SystemUI/res/flag(com.android.systemui.global_actions_icon_refresh_2025)/values/drawables.xml

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

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

  -->

<resources>

    <drawable name="ic_global_actions_bugreport">@*android:drawable/ic_lock_bugreport_round

    </drawable>

    <drawable name="ic_global_actions_emergency">@drawable/ic_emergency_star_round</drawable>

    <drawable name="ic_global_actions_lockdown">@*android:drawable/ic_lock_lockdown_round</drawable>

    <drawable name="ic_global_actions_logout">@*android:drawable/ic_logout_round</drawable>

    <drawable name="ic_global_actions_power_off">@*android:drawable/ic_lock_power_off_round

    </drawable>

    <drawable name="ic_global_actions_restart">@*android:drawable/ic_restart_round</drawable>

    <drawable name="ic_global_actions_screenshot">@*android:drawable/ic_screenshot_round</drawable>

</resources>

packages/SystemUI/res/values/drawables.xml

+8 −43
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

<resources>

    <!-- Drawable shown for the sensor unblock dialog when blocked by the hardware camera toggle -->

    <drawable name="unblock_hw_sensor_camera">@drawable/ic_videocam_off</drawable>

    <!-- Drawable shown for the sensor unblock dialog when blocked by the hardware microphone toggle -->
@@ -25,46 +25,11 @@ 


    <drawable name="qs_bluetooth_icon_disconnected">@drawable/vd_bluetooth</drawable>



    <drawable name="ic_global_actions_bugreport" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_lock_bugreport

    </drawable>

    <drawable name="ic_global_actions_bugreport" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_lock_bugreport_round

    </drawable>

    <drawable name="ic_global_actions_emergency" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @drawable/ic_emergency_star

    </drawable>

    <drawable name="ic_global_actions_emergency" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @drawable/ic_emergency_star_round

    </drawable>

    <drawable name="ic_global_actions_lockdown" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_lock_lockdown

    </drawable>

    <drawable name="ic_global_actions_lockdown" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_lock_lockdown_round

    </drawable>

    <drawable name="ic_global_actions_logout" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_logout

    </drawable>

    <drawable name="ic_global_actions_logout" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_logout_round

    </drawable>

    <drawable name="ic_global_actions_power_off" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_lock_power_off

    </drawable>

    <drawable name="ic_global_actions_power_off" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_lock_power_off_round

    </drawable>

    <drawable name="ic_global_actions_restart" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_restart

    </drawable>

    <drawable name="ic_global_actions_restart" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_restart_round

    </drawable>

    <drawable name="ic_global_actions_screenshot" android:featureFlag="!com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_screenshot

    </drawable>

    <drawable name="ic_global_actions_screenshot" android:featureFlag="com.android.systemui.global_actions_icon_refresh_2025">

        @*android:drawable/ic_screenshot_round

    </drawable>

    <drawable name="ic_global_actions_bugreport">@*android:drawable/ic_lock_bugreport</drawable>

    <drawable name="ic_global_actions_emergency">@drawable/ic_emergency_star</drawable>

    <drawable name="ic_global_actions_lockdown">@*android:drawable/ic_lock_lockdown</drawable>

    <drawable name="ic_global_actions_logout">@*android:drawable/ic_logout</drawable>

    <drawable name="ic_global_actions_power_off">@*android:drawable/ic_lock_power_off</drawable>

    <drawable name="ic_global_actions_restart">@*android:drawable/ic_restart</drawable>

    <drawable name="ic_global_actions_screenshot">@*android:drawable/ic_screenshot</drawable>

</resources>