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

Commit a2aa5ca4 authored by Tingting Wang's avatar Tingting Wang Committed by android-build-merger
Browse files

Merge "Fix bugs on RTL alignments." into ub-contactsdialer-a-dev am: 67c80a03 

am: 9f140ab2

* commit '9f140ab2':
  Fix bugs on RTL alignments.
parents 503e939e 9f140ab2

res/layout/compact_account_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
                android:singleLine="true"

                android:textColor="@color/secondary_text_color"

                android:ellipsize="end"

                android:textAlignment="viewStart"

                />



    </LinearLayout>

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

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ public class TextFieldsEditorView extends LabeledEditorView { 
                PhoneNumberFormatter.setPhoneNumberFormattingTextWatcher(getContext(), fieldView);

                fieldView.setTextDirection(View.TEXT_DIRECTION_LTR);

            }

            fieldView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);



            // Set either a minimum line requirement or a minimum height (because {@link TextView}

            // only takes one or the other at a single time).

src/com/android/contacts/quickcontact/QuickContactActivity.java

+6 −4
Original line number Diff line number Diff line
@@ -1200,15 +1200,16 @@ public class QuickContactActivity extends ContactsActivity 
    /** Assign this string to the view if it is not empty. */

    private void setHeaderNameText(int resId) {

        if (mScroller != null) {

            mScroller.setTitle(getText(resId) == null ? null : getText(resId).toString());

            mScroller.setTitle(getText(resId) == null ? null : getText(resId).toString(),

                    /* isPhoneNumber= */ false);

        }

    }



    /** Assign this string to the view if it is not empty. */

    private void setHeaderNameText(String value) {

    private void setHeaderNameText(String value, boolean isPhoneNumber) {

        if (!TextUtils.isEmpty(value)) {

            if (mScroller != null) {

                mScroller.setTitle(value);

                mScroller.setTitle(value, isPhoneNumber);

            }

        }

    }
@@ -1242,7 +1243,8 @@ public class QuickContactActivity extends ContactsActivity 
        mPhotoSetter.setupContactPhoto(data, mPhotoView);

        extractAndApplyTintFromPhotoViewAsynchronously();

        final String displayName = ContactDisplayUtils.getDisplayName(this, data).toString();

        setHeaderNameText(displayName);

        setHeaderNameText(

                displayName, mContactData.getDisplayNameSource() == DisplayNameSources.PHONE);

        final String phoneticName = ContactDisplayUtils.getPhoneticName(this, data);

        if (mScroller != null) {

            if (mContactData.getDisplayNameSource() != DisplayNameSources.STRUCTURED_PHONETIC_NAME

src/com/android/contacts/widget/MultiShrinkScroller.java

+5 −1
Original line number Diff line number Diff line
@@ -395,8 +395,12 @@ public class MultiShrinkScroller extends FrameLayout { 
        mTitleGradientView.setLayoutParams(titleGradientLayoutParams);

    }



    public void setTitle(String title) {

    public void setTitle(String title, boolean isPhoneNumber) {

        mLargeTextView.setText(title);

        // We have a phone number as "mLargeTextView" so make it always LTR.

        if (isPhoneNumber) {

            mLargeTextView.setTextDirection(View.TEXT_DIRECTION_LTR);

        }

        mPhotoTouchInterceptOverlay.setContentDescription(title);

    }