Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.AccountAndSecurityActivity">
 
    <include
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
 
 
    <include
        android:id="@+id/set_account_phone_il"
        layout="@layout/set_line"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:layout_marginTop="@dimen/dp_12"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" />
 
    <include
        android:id="@+id/set_account_mail_il"
        layout="@layout/set_line"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/set_account_phone_il" />
 
    <include
        android:id="@+id/set_change_psw_il"
        layout="@layout/set_line"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/set_account_mail_il" />
 
    <include
        android:id="@+id/set_account_close_il"
        layout="@layout/set_line"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_57"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/set_change_psw_il" />
 
<!--    &lt;!&ndash;暂时隐藏注销账号组件&ndash;&gt;-->
<!--    <TextView-->
<!--        android:id="@+id/set_account_close"-->
<!--        android:layout_width="match_parent"-->
<!--        android:layout_height="@dimen/dp_52"-->
<!--        android:layout_marginStart="@dimen/dp_20"-->
<!--        android:layout_marginEnd="@dimen/dp_20"-->
<!--        android:layout_marginBottom="@dimen/dp_55"-->
<!--        android:background="@drawable/backgruond_ff6b6b"-->
<!--        android:gravity="center"-->
<!--        android:text="@string/set_close_account"-->
<!--        android:textColor="@color/text_FFFFFFFF"-->
<!--        android:textSize="@dimen/text_18"-->
<!--        app:layout_constraintBottom_toBottomOf="parent"-->
<!--        app:layout_constraintEnd_toEndOf="parent"-->
<!--        app:layout_constraintStart_toStartOf="parent"-->
 
<!--        />-->
 
 
</androidx.constraintlayout.widget.ConstraintLayout>