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

Commit 57e48dab authored by Katherine Kuan's avatar Katherine Kuan Committed by Android (Google) Code Review
Browse files

Merge "Account header icon cut off in contact editor for local contacts"

parents fad0b4b3 2ea2ebbd

res/layout/editor_account_header.xml

+6 −4
Original line number Diff line number Diff line
@@ -38,18 +38,20 @@ 


        <TextView

            android:id="@+id/account_type"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:singleLine="true" />

            android:singleLine="true"

            android:ellipsize="end" />



        <TextView

             android:id="@+id/account_name"

             android:layout_width="wrap_content"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:textAppearance="?android:attr/textAppearanceSmall"

             android:textColor="?android:attr/textColorTertiary"

             android:singleLine="true" />

             android:singleLine="true"

             android:ellipsize="end" />



    </LinearLayout>

res/layout/editor_account_header_with_dropdown.xml

+10 −12
Original line number Diff line number Diff line
@@ -29,37 +29,35 @@ 
    <LinearLayout

        android:id="@+id/account"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_width="0dip"

        android:layout_weight="1"

        android:orientation="vertical"

        style="?android:attr/spinnerStyle">



        <TextView

            android:id="@+id/account_type"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:singleLine="true" />

            android:singleLine="true"

            android:ellipsize="end" />



        <TextView

             android:id="@+id/account_name"

             android:layout_width="wrap_content"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:paddingRight="8dip"

             android:textAppearance="?android:attr/textAppearanceSmall"

             android:textColor="?android:attr/textColorTertiary"

             android:singleLine="true" />

             android:singleLine="true"

             android:ellipsize="end" />



    </LinearLayout>



    <!-- Spacer between the account type / name dropdown and the account icon -->

    <View

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:layout_weight="1"/>



    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        android:layout_marginLeft="10dip">



        <ImageView

             android:id="@+id/account_icon"

src/com/android/contacts/editor/ExternalRawContactEditorView.java

+4 −0
Original line number Diff line number Diff line
@@ -148,8 +148,12 @@ public class ExternalRawContactEditorView extends BaseRawContactEditorView 
                accountType = mContext.getString(R.string.account_phone);

            }

            if (!TextUtils.isEmpty(mAccountName)) {

                mAccountNameTextView.setVisibility(View.VISIBLE);

                mAccountNameTextView.setText(

                        mContext.getString(R.string.from_account_format, mAccountName));

            } else {

                // Hide this view so the other text view will be centered vertically

                mAccountNameTextView.setVisibility(View.GONE);

            }

            mAccountTypeTextView.setText(mContext.getString(R.string.account_type_format,

                    accountType));

src/com/android/contacts/editor/RawContactEditorView.java

+4 −0
Original line number Diff line number Diff line
@@ -195,8 +195,12 @@ public class RawContactEditorView extends BaseRawContactEditorView { 
                accountType = mContext.getString(R.string.account_phone);

            }

            if (!TextUtils.isEmpty(accountName)) {

                mAccountNameTextView.setVisibility(View.VISIBLE);

                mAccountNameTextView.setText(

                        mContext.getString(R.string.from_account_format, accountName));

            } else {

                // Hide this view so the other text view will be centered vertically

                mAccountNameTextView.setVisibility(View.GONE);

            }

            mAccountTypeTextView.setText(

                    mContext.getString(R.string.account_type_format, accountType));