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

Commit cc8771bb authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Add checkmark to indicate currently applied style 

Fixes: 126897804
Change-Id: I2bb2add206f3ee1a63372a8082d68f93fed90e60
parent 2289855f

res/drawable/ic_check_circle_filled_24px.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2019 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="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="@color/selected_check_background_color"

      android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM10,17l-4,-4l1.4,-1.4l2.6,2.6l6.6,-6.6L18,9L10,17z"/>

  <path

      android:pathData="m8.0085,14.9866 l-1.9939,-1.994 0.6892,-0.6889 0.6892,-0.6889 1.2925,1.2926c0.7109,0.711 1.3035,1.2926 1.3169,1.2926 0.0134,0 1.5034,-1.4789 3.3111,-3.2865l3.2866,-3.2865 0.689,0.689 0.689,0.689 -3.9878,3.9878 -3.9878,3.9878z"

      android:strokeWidth="0.02439024"

      android:fillColor="@color/selected_check_color"/>

</vector>

res/values-night/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
    <color name="tip_dot_color">#81C995</color>

    <color name="tip_dot_line_color">#000000</color>



    <color name="selected_check_color">#000000</color>

    <color name="selected_check_background_color">#81C995</color>



    <color name="toolbar_icon_color">@color/text_color_light</color>

    <color name="toolbar_color">#000000</color>

</resources>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 
    <color name="tip_dot_color">#34A853</color>

    <color name="tip_dot_line_color">#FFFFFF</color>



    <color name="selected_check_color">#FFFFFF</color>

    <color name="selected_check_background_color">#1E8E3E</color>



    <color name="toolbar_icon_color">@color/text_color_dark</color>

    <color name="toolbar_color">@color/material_white_100</color>

</resources>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <dimen name="tip_dot_size">8dp</dimen>

    <dimen name="tip_dot_line_width">2dp</dimen>



    <dimen name="check_size">12dp</dimen>



    <dimen name="preview_indicator_width">16dp</dimen>

    <dimen name="preview_indicator_height">8dp</dimen>

    <dimen name="indicator_container_height">48dp</dimen>

src/com/android/customization/picker/theme/ThemeFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -262,6 +262,9 @@ public class ThemeFragment extends ToolbarFragment { 
                // Select the default theme if there is no matching custom enabled theme

                // TODO(b/124796742): default to custom if there is no matching theme bundle

                mSelectedTheme = options.get(0);

            } else {

                // Only show show checkmark if we found a matching theme

                mOptionsController.setAppliedOption(mSelectedTheme);

            }

            mOptionsController.setSelectedOption(mSelectedTheme);

        }, false);
@@ -280,6 +283,9 @@ public class ThemeFragment extends ToolbarFragment { 
                // Select the default theme if there is no matching custom enabled theme

                // TODO(b/124796742): default to custom if there is no matching theme bundle

                mSelectedTheme = options.get(0);

            } else {

                // Only show show checkmark if we found a matching theme

                mOptionsController.setAppliedOption(mSelectedTheme);

            }

            mOptionsController.setSelectedOption(mSelectedTheme);

        }, true);