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

Commit 36ce63dc authored by jackqdyulei's avatar jackqdyulei
Browse files

Add fp icon with background shape 

Fixes: 126425211
Test: RunSettingsRoboTests

Change-Id: I779f76f597b80d73b6dd6eb9e43a96abc9fee0bb
parent b4ae464e

color-check-baseline.xml

+16 −0
Original line number Diff line number Diff line
@@ -1533,6 +1533,22 @@ 
            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;color name=&quot;bt_outline_color&quot;>#1f000000&lt;/color> &lt;!-- icon outline color -->"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="160"

            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -156,4 +156,6 @@ 
    <color name="bt_color_bg_5">#fdcfe8</color> <!-- Material Pink 100 -->

    <color name="bt_color_bg_6">#e9d2fd</color> <!-- Material Purple 100 -->

    <color name="bt_color_bg_7">#cbf0f8</color> <!-- Material Cyan 100 -->



    <color name="bt_outline_color">#1f000000</color> <!-- icon outline color -->

</resources>
 
 No newline at end of file

res/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -404,4 +404,13 @@ 


    <!-- Wi-Fi DPP fragment icon size -->

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



    <!-- Size of nearby icon -->

    <dimen name="bt_nearby_icon_size">24dp</dimen>



    <!-- Stroke size of adaptive outline -->

    <dimen name="adaptive_outline_stroke">1dp</dimen>



    <!-- Elevation of bluetooth icon -->

    <dimen name="bt_icon_elevation">4dp</dimen>

</resources>

src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java

+4 −2
Original line number Diff line number Diff line
@@ -80,9 +80,11 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController 


    @Override

    protected void refresh() {

        if (isAvailable()) {

            setHeaderProperties();

            mHeaderController.done(mFragment.getActivity(), true /* rebindActions */);

        }

    }



    @Override

    public String getPreferenceKey() {

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ public final class BluetoothDevicePreference extends GearPreference implements 
        final ImageView imageView = (ImageView) view.findViewById(android.R.id.icon);

        if (imageView != null) {

            imageView.setContentDescription(contentDescription);

            imageView.setElevation(

                    getContext().getResources().getDimension(R.dimen.bt_icon_elevation));

        }

        super.onBindViewHolder(view);

    }