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

Commit e1c6d043 authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(magnification panel): magnifier size title may be cut off when... 

Merge "fix(magnification panel): magnifier size title may be cut off when large font size" into main
parents e4fa10ba 6d5898f9

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,9 +29,13 @@ 
        android:layout_height="wrap_content"

        android:orientation="horizontal">

        <TextView

            android:id="@+id/magnifier_size_title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:singleLine="true"

            android:scrollHorizontally="true"

            android:ellipsize="marquee"

            android:text="@string/accessibility_magnifier_size"

            android:textAppearance="@style/TextAppearance.MagnificationSetting.Title"

            android:focusable="true"

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
    private ImageButton mMediumButton;

    private ImageButton mLargeButton;

    private Button mDoneButton;

    private TextView mSizeTitle;

    private Button mEditButton;

    private ImageButton mFullScreenButton;

    private int mLastSelectedButtonIndex = MagnificationSize.NONE;
@@ -521,6 +522,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
        mMediumButton = mSettingView.findViewById(R.id.magnifier_medium_button);

        mLargeButton = mSettingView.findViewById(R.id.magnifier_large_button);

        mDoneButton = mSettingView.findViewById(R.id.magnifier_done_button);

        mSizeTitle = mSettingView.findViewById(R.id.magnifier_size_title);

        mEditButton = mSettingView.findViewById(R.id.magnifier_edit_button);

        mFullScreenButton = mSettingView.findViewById(R.id.magnifier_full_button);

        mAllowDiagonalScrollingTitle =
@@ -548,6 +550,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
        mDoneButton.setOnClickListener(mButtonClickListener);

        mFullScreenButton.setOnClickListener(mButtonClickListener);

        mEditButton.setOnClickListener(mButtonClickListener);

        mSizeTitle.setSelected(true);

        mAllowDiagonalScrollingTitle.setSelected(true);



        mSettingView.setOnApplyWindowInsetsListener((v, insets) -> {