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

Commit 33dbef15 authored by Ajinkya Chalke's avatar Ajinkya Chalke
Browse files

Update Backlinks checkbox to match mocks 

- The checkbox wasn't visible in darkmode when unchecked. Setting a tint
  also wasn't helping. So updated to use a custom circular one with the
  right colours.
- For some reason the older text color didn't behave correctly with dark
  mode. So, updated to use a similar variant but of material colour.
- Updated the shape of the checkbox to circular.

Bug: 300307759
Change-Id: I550473267b76c8af9220284825a8b3d53edd4358
Test: Manually verified the text colour for light and dark themes
Flag: com.android.systemui.app_clips_backlinks
parent 961d453b

packages/SystemUI/res/drawable/checkbox_circle_shape.xml

0 → 100644
+32 −0
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.

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:bottom="12dp"

        android:left="12dp"

        android:right="12dp"

        android:top="12dp">

        <selector>

            <item

                android:drawable="@drawable/ic_check_circle_filled_24dp"

                android:state_checked="true" />

            <item

                android:drawable="@drawable/ic_circle_outline_24dp"

                android:state_checked="false" />

        </selector>

    </item>

</layer-list>

packages/SystemUI/res/drawable/ic_check_circle_filled_24dp.xml

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

  -->

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?androidprv:attr/materialColorPrimary"

    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10c5.52,0 10,-4.48 10,-10S17.52,2 12,2zM10.59,16.6l-4.24,-4.24l1.41,-1.41l2.83,2.83l5.66,-5.66l1.41,1.41L10.59,16.6z" />

</vector>

packages/SystemUI/res/drawable/ic_circle_outline_24dp.xml

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

  -->

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?androidprv:attr/materialColorPrimary"

    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />

</vector>

packages/SystemUI/res/layout/app_clips_screenshot.xml

+2 −1
Original line number Diff line number Diff line
@@ -58,9 +58,10 @@ 
        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:layout_marginStart="16dp"

        android:button="@drawable/checkbox_circle_shape"

        android:checked="true"

        android:text="@string/backlinks_include_link"

        android:textColor="?android:textColorSecondary"

        android:textColor="?androidprv:attr/materialColorOnBackground"

        android:visibility="gone"

        app:layout_constraintBottom_toTopOf="@id/preview"

        app:layout_constraintStart_toEndOf="@id/cancel"