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

Commit 62ad480c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7643198 from c9ce62c0 to sc-d1-release 

Change-Id: I0eee1b8eaa4390f26f69ab1716e3ac550b93ac65
parents 018679a2 c9ce62c0

core/java/android/hardware/face/FaceManager.java

+5 −0
Original line number Diff line number Diff line
@@ -790,6 +790,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                }

            }

        }



        // This is used as a last resort in case a vendor string is missing

        // It should not happen for anything other than FACE_ERROR_VENDOR, but

        // warn and use the default if all else fails.

        // TODO(b/196639965): update string

        Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);

        return "";

    }

core/java/android/hardware/fingerprint/FingerprintManager.java

+6 −1
Original line number Diff line number Diff line
@@ -1386,8 +1386,13 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
                }

            }

        }



        // This is used as a last resort in case a vendor string is missing

        // It should not happen for anything other than FINGERPRINT_ERROR_VENDOR, but

        // warn and use the default if all else fails.

        // TODO(b/196639965): update string

        Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);

        return null;

        return "";

    }



    /**

packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ 
    <style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>

        <item name="android:textSize">20dp</item>

        <item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>

    </style>



    <style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">

        <item name="android:textSize">36dp</item>

        <item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>

    </style>

</resources>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -41,4 +41,6 @@ 


    <!-- copy from accent_primary_variant_dark_device_default-->

    <color name="settingslib_accent_primary_variant">@android:color/system_accent1_300</color>



    <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_50</color>

</resources>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -63,4 +63,6 @@ 
    <color name="settingslib_background_device_default_dark">@android:color/system_neutral1_900</color>



    <color name="settingslib_background_device_default_light">@android:color/system_neutral1_50</color>



    <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_900</color>

</resources>