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

Commit 487d1183 authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury Committed by Nishith Khanna
Browse files

Issue 1756: Account selector ui fix

parent a984df3f

res/layout/account_selector_list_item_condensed.xml

+1 −11
Original line number Diff line number Diff line
@@ -38,19 +38,9 @@ 
            android:layout_marginRight="8dip"

            android:layout_marginEnd="8dip"

            android:textSize="16sp"

            android:textColor="@color/contacts_text_color"

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

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

            android:singleLine="true"

            android:ellipsize="end"/>



        <TextView android:id="@android:id/text2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="24dp"

            android:textSize="14sp"

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

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

            android:singleLine="true"

            android:ellipsize="end"/>

    </LinearLayout>

</LinearLayout>

res/layout/dialog_title.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:paddingStart="24dp"

    android:paddingEnd="24dp"

    android:textSize="20sp"

    android:textColor="@color/contacts_text_color"

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

    android:textAlignment="viewStart"

    android:fontFamily="sans-serif-medium"

    android:ellipsize="end"

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ 
        <item name="android:windowCloseOnTouchOutside">true</item>

    </style>



    <style name="ContactEditorAccountsChangedActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar.MinWidth">

    <style name="ContactEditorAccountsChangedActivityTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">

        <item name="android:windowCloseOnTouchOutside">true</item>

        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

src/com/android/contacts/util/AccountSelectionUtil.java

+1 −5
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ public class AccountSelectionUtil { 
                }



                final TextView text1 = (TextView) convertView.findViewById(android.R.id.text1);

                final TextView text2 = (TextView) convertView.findViewById(android.R.id.text2);

                final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);



                final AccountWithDataSet account = this.getItem(position);
@@ -124,10 +123,7 @@ public class AccountSelectionUtil { 
                        account.type, account.dataSet);

                final Context context = getContext();



                text1.setText(accountType.getDisplayLabel(context));

                text2.setText(account.name);

                text2.setVisibility(context.getPackageName().equals(account.type) ?

                        View.GONE : View.VISIBLE);

                text1.setText(account.name);

                icon.setImageDrawable(accountType.getDisplayIcon(getContext()));



                return convertView;

src/com/android/contacts/util/AccountsListAdapter.java

+1 −5
Original line number Diff line number Diff line
@@ -90,13 +90,9 @@ public final class AccountsListAdapter extends BaseAdapter { 
                        R.layout.account_selector_list_item_condensed, parent, false);



        final TextView text1 = (TextView) resultView.findViewById(android.R.id.text1);

        final TextView text2 = (TextView) resultView.findViewById(android.R.id.text2);

        final ImageView icon = (ImageView) resultView.findViewById(android.R.id.icon);



        text1.setText(mAccounts.get(position).getTypeLabel());

        text2.setText(mAccounts.get(position).getNameLabel());

        text2.setVisibility(mAccounts.get(position).getNameLabel().equals(

                mAccounts.get(position).getTypeLabel()) ? View.GONE : View.VISIBLE);

        text1.setText(mAccounts.get(position).getNameLabel());



        icon.setImageDrawable(mAccounts.get(position).getIcon());