Merge branch '1.5.2' into 1.5.1_google

wjc

2025-04-09 0b357bcd7c472c91227093239f180a28638c57a4

 app/src/main/res/layout/view_camera_album.xml

@@ -12,7 +12,7 @@
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/me_personal_data_photograph"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="14sp" />

    <View
@@ -26,7 +26,7 @@
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/me_personal_data_select_album"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="14sp" />

    <View
@@ -40,7 +40,7 @@
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/loading_cancel"
        android:textColor="@color/text_66FFFFFF"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="14sp" />

</LinearLayout>