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

Commit b514280b authored by Shawn Lin's avatar Shawn Lin
Browse files

Hide the divider in the face removal preference 

The divider in the face removal preference confuses users and though
there were 2 buttons in this preference.

Remove the divider to fix it and also update incorrect icon tint color.

Bug: 406378121
Test: manual
Flag: EXEMPT bugfix
Change-Id: Iea303d8f107ba32980ff518610d1cc7525eef49d
parent 905c0af4

res/drawable/ic_face.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        android:height="24dp"

        android:viewportWidth="960"

        android:viewportHeight="960"

        android:tint="?attr/colorControlNormal">

        android:tint="?android:attr/colorControlNormal">

    <path

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

        android:pathData="M360,570Q339,570 324.5,555.5Q310,541 310,520Q310,499 324.5,484.5Q339,470 360,470Q381,470 395.5,484.5Q410,499 410,520Q410,541 395.5,555.5Q381,570 360,570ZM600,570Q579,570 564.5,555.5Q550,541 550,520Q550,499 564.5,484.5Q579,470 600,470Q621,470 635.5,484.5Q650,499 650,520Q650,541 635.5,555.5Q621,570 600,570ZM480,800Q614,800 707,707Q800,614 800,480Q800,456 797,433.5Q794,411 786,390Q765,395 744,397.5Q723,400 700,400Q609,400 528,361Q447,322 390,252Q358,330 298.5,387.5Q239,445 160,474Q160,476 160,477Q160,478 160,480Q160,614 253,707Q346,800 480,800ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM426,165Q468,235 540,277.5Q612,320 700,320Q714,320 727,318.5Q740,317 754,315Q712,245 640,202.5Q568,160 480,160Q466,160 453,161.5Q440,163 426,165ZM177,379Q228,350 266,304Q304,258 323,201Q272,230 234,276Q196,322 177,379ZM426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165Q426,165 426,165ZM323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Q323,201 323,201Z"/>

src/com/android/settings/biometrics/face/FacePreference.java

+18 −0
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package com.android.settings.biometrics.face; 


import android.content.Context;

import android.util.AttributeSet;

import android.view.View;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;

import com.android.settingslib.widget.TwoTargetPreference;
@@ -49,4 +51,20 @@ public class FacePreference extends TwoTargetPreference { 
    protected int getSecondTargetResId() {

        return R.layout.preference_widget_delete;

    }



    @Override

    public void onBindViewHolder(PreferenceViewHolder view) {

        super.onBindViewHolder(view);

        final View divider = view.findViewById(

                com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);

        if (divider != null) {

            divider.setVisibility(View.GONE);

        }



        final View deleteIcon = view.findViewById(R.id.delete_button);

        if (deleteIcon != null) {

            // prevent overlapped ripple effect when clicking

            deleteIcon.setBackground(null);

        }

    }

}