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

Commit d1cc48c1 authored by Candice Lo's avatar Candice Lo
Browse files

Fix truncation in Allow diagonal scrolling 

Fixing the truncation in the text that exceeds the boundary of textview
with settings ellipsize=marquee and allow horizontally scrolling.

Bug: 280162065
Test: manually - attach videos in the bug
Change-Id: I7965ced2dfdccfa83c2add8fa7f81ba12e8fc720
parent 95dff23f

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+4 −0
Original line number Diff line number Diff line
@@ -112,9 +112,13 @@ 
        android:focusable="true">



        <TextView

            android:id="@+id/magnifier_horizontal_lock_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_allow_diagonal_scrolling"

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

            android:layout_gravity="center_vertical" />

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

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.widget.ImageButton; 
import android.widget.LinearLayout;

import android.widget.SeekBar;

import android.widget.Switch;

import android.widget.TextView;



import com.android.internal.accessibility.common.MagnificationConstants;

import com.android.internal.annotations.VisibleForTesting;
@@ -87,6 +88,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 


    private SeekBarWithIconButtonsView mZoomSeekbar;

    private LinearLayout mAllowDiagonalScrollingView;

    private TextView mAllowDiagonalScrollingTitle;

    private Switch mAllowDiagonalScrollingSwitch;

    private LinearLayout mPanelView;

    private LinearLayout mSettingView;
@@ -467,6 +469,8 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
        mDoneButton = mSettingView.findViewById(R.id.magnifier_done_button);

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

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

        mAllowDiagonalScrollingTitle =

                mSettingView.findViewById(R.id.magnifier_horizontal_lock_title);



        mZoomSeekbar = mSettingView.findViewById(R.id.magnifier_zoom_slider);

        float scale = mSecureSettings.getFloatForUser(
@@ -490,6 +494,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
        mDoneButton.setOnClickListener(mButtonClickListener);

        mFullScreenButton.setOnClickListener(mButtonClickListener);

        mEditButton.setOnClickListener(mButtonClickListener);

        mAllowDiagonalScrollingTitle.setSelected(true);



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

            // Adds a pending post check to avoiding redundant calculation because this callback