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

Commit f4fd8183 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix truncation in Allow diagonal scrolling" into udc-dev am:... 

Merge "Merge "Fix truncation in Allow diagonal scrolling" into udc-dev am: 8c7aa844 am: bb29b528 am: 56f7e465" into udc-qpr-dev-plus-aosp
parents 32e9f274 c1d3183d

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