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

Commit b7214fd5 authored by Walter Jang's avatar Walter Jang Committed by android-build-merger
Browse files

Merge "Reduce and equalize account and linked selector heights" into ub-contactsdialer-a-dev 

am: 3574b16e

* commit '3574b16e':
  Reduce and equalize account and linked selector heights
parents 367128b6 3574b16e

res/layout-land/compact_contact_editor_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 
                android:layout_height="match_parent"

                android:orientation="vertical">



            <include layout="@layout/editor_all_rawcontacts_accounts_selector" />

            <include layout="@layout/compact_account_info" />

            <include layout="@layout/editor_account_selector" />

            <include layout="@layout/editor_all_rawcontacts_accounts_selector" />



            <include layout="@layout/compact_contact_editor_fields"/>

res/layout/compact_account_info.xml

+4 −7
Original line number Diff line number Diff line
@@ -21,26 +21,23 @@ 
        android:id="@+id/account_container"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:minHeight="@dimen/editor_min_line_item_height"

        android:orientation="horizontal"

        android:background="?android:attr/selectableItemBackground"

        android:paddingTop="8dip"

        android:visibility="gone"

        >





    <ImageView

            android:id="@+id/account_type_icon"

            android:layout_width="@dimen/detail_network_icon_size"

            android:layout_height="@dimen/detail_network_icon_size"

            android:layout_margin="16dip"

            android:layout_gravity="center_vertical" />

            style="@style/EditSelectorIconStyle"/>



    <LinearLayout

            android:layout_height="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:paddingBottom="24dp"

            android:paddingTop="24dp"

            android:layout_marginStart="@dimen/compact_editor_account_left_margin"

            android:layout_gravity="center_vertical"

            android:orientation="vertical"

            >

res/layout/compact_contact_editor_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 


        <include layout="@layout/compact_photo_editor_view" />



        <include layout="@layout/editor_all_rawcontacts_accounts_selector" />

        <include layout="@layout/compact_account_info" />

        <include layout="@layout/editor_account_selector" />

        <include layout="@layout/editor_all_rawcontacts_accounts_selector" />



        <!-- Dummy view so the first input field is not initially focused. b/21644158 -->

        <View

res/layout/editor_account_selector.xml

+4 −4
Original line number Diff line number Diff line
@@ -21,23 +21,23 @@ 
    android:id="@+id/account_selector_container"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:minHeight="48dip"

    android:layout_marginBottom="@dimen/editor_padding_between_editor_views"

    android:minHeight="@dimen/editor_min_line_item_height"

    android:orientation="horizontal"

    android:paddingTop="16dp"

    android:visibility="gone" >



    <ImageView

        android:id="@+id/kind_icon"

        android:src="@drawable/ic_account_circle_black_24dp"

        android:tint="@color/editor_icon_color"

        android:contentDescription="@string/header_account_entry"

        style="@style/EditKindIconStyle" />

        style="@style/EditSelectorIconStyle"/>



    <LinearLayout

        android:id="@+id/account"

        android:layout_height="wrap_content"

        android:layout_width="0dip"

        android:layout_weight="1"

        android:layout_gravity="center_vertical"

        android:orientation="vertical"

        android:layout_marginEnd="48dp"

        style="@android:style/Widget.Material.Spinner.Underlined">

res/layout/editor_all_rawcontacts_accounts_selector.xml

+3 −7
Original line number Diff line number Diff line
@@ -21,18 +21,14 @@ 
        android:id="@+id/all_rawcontacts_accounts_container"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:minHeight="@dimen/editor_min_line_item_height"

        android:orientation="horizontal"

        android:paddingTop="8dip"

        android:paddingBottom="8dip"

        android:gravity="center_vertical"

        android:visibility="gone" >



    <ImageView

            android:src="@drawable/ic_link_grey600_drawable_24dp"

            android:layout_width="@dimen/detail_network_icon_size"

            android:layout_height="@dimen/detail_network_icon_size"

            android:layout_margin="16dip"

            android:layout_gravity="center_vertical"/>

            android:tint="@color/editor_icon_color"

            style="@style/EditSelectorIconStyle"/>



    <TextView

            android:id="@+id/rawcontacts_accounts_summary"