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

Commit 0293fb40 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Update UI for support tab." into nyc-mr1-dev

parents ebed4797 d89d60d9
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@
    android:height="24dp"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0"
    android:tint="?android:attr/colorControlNormal">
    android:tint="?android:attr/colorAccent">
    <path
        android:fillColor="#FFFFFFFF"
        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48
        10,-10S17.52,2 12,2zm1,17h-2v-2h2v2zm2.07,-7.75l-0.9,0.92C13.45,12.9 13,13.5
        13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41
        0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2H8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88
        -0.36,1.68 -0.93,2.25z"/>
        android:fillColor="#FF000000"
        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2
        1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0
         -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66
          1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
</vector>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
    android:height="24dp"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0"
    android:tint="?android:attr/colorControlNormal">
    android:tint="?android:attr/colorAccent">
    <path
        android:fillColor="#FF000000"
        android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:gravity="end"
        android:paddingEnd="20dp"
        android:paddingEnd="18dp"
        android:textAppearance="@style/TextAppearance.SuggestionTitle"
        android:textColor="?android:attr/colorAccent"/>
</LinearLayout>
+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@
        <Spinner
            android:id="@+id/spinner"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"/>
            android:layout_height="wrap_content"
            android:dropDownWidth="196dp"/>
    </LinearLayout>
    <Button
        android:id="@android:id/text1"
+19 −6
Original line number Diff line number Diff line
@@ -18,20 +18,33 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:padding="24dp">
    android:paddingStart="24dp"
    android:paddingEnd="24dp"
    android:paddingTop="12dp"
    android:paddingBottom="12dp">
    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingBottom="16dp"
        android:text="@string/support_international_phone_summary"/>
    <TextView
        android:id="@+id/phone_number"
    <LinearLayout
        android:id="@+id/phone_number_container"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?android:attr/selectableItemBackground"
        android:drawableLeft="@drawable/ic_call_24dp"
        android:drawablePadding="16dp"
        android:gravity="center_vertical"
        android:minHeight="48dp"
        android:orientation="horizontal">
        <ImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:paddingEnd="32dp"
            android:src="@drawable/ic_call_24dp"/>
        <TextView
            android:id="@+id/phone_number"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center_vertical"
            android:textAppearance="@style/TextAppearance.TileTitle"/>
    </LinearLayout>
</LinearLayout>
 No newline at end of file
Loading