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

Commit 099bb9c7 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Use same color for all indicators" into sc-dev

parents 61314e0c 09836c50

packages/SystemUI/res/drawable/privacy_chip_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->



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

    <solid android:color="#FFFFFF" />

    <solid android:color="@color/privacy_circle" />

    <corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/privacy_item_circle_camera.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
                android:height="@dimen/ongoing_appops_dialog_circle_size"

                android:width="@dimen/ongoing_appops_dialog_circle_size"

            />

            <solid android:color="@color/privacy_circle_camera" />

            <solid android:color="@color/privacy_circle" />

        </shape>

    </item>

    <item android:id="@id/icon"

packages/SystemUI/res/drawable/privacy_item_circle_location.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
                android:height="@dimen/ongoing_appops_dialog_circle_size"

                android:width="@dimen/ongoing_appops_dialog_circle_size"

            />

            <solid android:color="@color/privacy_circle_microphone_location" />

            <solid android:color="@color/privacy_circle" />

        </shape>

    </item>

    <item android:id="@id/icon"

packages/SystemUI/res/drawable/privacy_item_circle_microphone.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
                android:height="@dimen/ongoing_appops_dialog_circle_size"

                android:width="@dimen/ongoing_appops_dialog_circle_size"

            />

            <solid android:color="@color/privacy_circle_microphone_location" />

            <solid android:color="@color/privacy_circle" />

        </shape>

    </item>

    <item android:id="@id/icon"

packages/SystemUI/res/values-night/colors.xml

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ 
    <color name="qs_user_switcher_avatar_background">#3C4043</color>



    <!-- Colors for privacy dialog. These should be changed to the new palette -->

    <color name="privacy_circle_camera">#81C995</color> <!-- g300 -->

    <color name="privacy_circle_microphone_location">#FCAD70</color> <!--o300 -->

    <color name="privacy_circle">#81C995</color> <!-- g300 -->



    <!-- Accessibility floating menu -->

    <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->