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

Commit 96a9f3bf authored by Olivier St-Onge's avatar Olivier St-Onge Committed by Android (Google) Code Review
Browse files

Merge "Remove global actions icon refresh flag" into main

parents fa4a167f ecdf5c25

core/res/res/drawable/ic_lock_lockdown.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<!--

Copyright (C) 2018 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="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#FF000000"

        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/>

</vector>

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -1438,7 +1438,6 @@ 
  <java-symbol type="drawable" name="ic_lock_open" />

  <java-symbol type="drawable" name="ic_lock_bugreport" />

  <java-symbol type="drawable" name="ic_lock_bugreport_round" />

  <java-symbol type="drawable" name="ic_lock_lockdown" />

  <java-symbol type="drawable" name="ic_lock_lockdown_round" />

  <java-symbol type="drawable" name="ic_lock_power_off" />

  <java-symbol type="drawable" name="ic_lock_power_off_round" />
@@ -4455,7 +4454,6 @@ 
  <java-symbol type="attr" name="opticalInsetRight" />

  <java-symbol type="attr" name="opticalInsetBottom" />



  <java-symbol type="drawable" name="ic_lock_lockdown" />

  <java-symbol type="drawable" name="ic_arrow_forward" />

  <java-symbol type="drawable" name="ic_permission" />

packages/SystemUI/aconfig/systemui.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -502,17 +502,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "global_actions_icon_refresh_2025"

    namespace: "systemui"

    description: "Build time flag for 2025 power menu icon refresh"

    bug: "427755140"

    is_fixed_read_only: true

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "promote_notifications_automatically"

    namespace: "systemui"

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

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

+9 −7
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ 


    <drawable name="qs_bluetooth_icon_disconnected">@drawable/vd_bluetooth</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>

    <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>