Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Candice Lo
2023-05-12 16:47:04 +00:00
committed by Android (Google) Code Review
parent 9087a59ff5 d1cc48c14c
commit 8c7aa84441
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/window_magnification_settings_view.xml
View File

@@ -112,9 +112,13 @@
android:focusable="true"> android:focusable="true">
<TextView <TextView
android:id="@+id/magnifier_horizontal_lock_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:singleLine="true"
android:scrollHorizontally="true"
android:ellipsize="marquee"
android:text="@string/accessibility_allow_diagonal_scrolling" android:text="@string/accessibility_allow_diagonal_scrolling"
android:textAppearance="@style/TextAppearance.MagnificationSetting.Title" android:textAppearance="@style/TextAppearance.MagnificationSetting.Title"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />

5
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java
View File

@@ -53,6 +53,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView;
import com.android.internal.accessibility.common.MagnificationConstants; import com.android.internal.accessibility.common.MagnificationConstants;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
@@ -87,6 +88,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
private SeekBarWithIconButtonsView mZoomSeekbar; private SeekBarWithIconButtonsView mZoomSeekbar;
private LinearLayout mAllowDiagonalScrollingView; private LinearLayout mAllowDiagonalScrollingView;
private TextView mAllowDiagonalScrollingTitle;
private Switch mAllowDiagonalScrollingSwitch; private Switch mAllowDiagonalScrollingSwitch;
private LinearLayout mPanelView; private LinearLayout mPanelView;
private LinearLayout mSettingView; private LinearLayout mSettingView;
@@ -467,6 +469,8 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
mDoneButton = mSettingView.findViewById(R.id.magnifier_done_button); mDoneButton = mSettingView.findViewById(R.id.magnifier_done_button);
mEditButton = mSettingView.findViewById(R.id.magnifier_edit_button); mEditButton = mSettingView.findViewById(R.id.magnifier_edit_button);
mFullScreenButton = mSettingView.findViewById(R.id.magnifier_full_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); mZoomSeekbar = mSettingView.findViewById(R.id.magnifier_zoom_slider);
float scale = mSecureSettings.getFloatForUser( float scale = mSecureSettings.getFloatForUser(
@@ -490,6 +494,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
mDoneButton.setOnClickListener(mButtonClickListener); mDoneButton.setOnClickListener(mButtonClickListener);
mFullScreenButton.setOnClickListener(mButtonClickListener); mFullScreenButton.setOnClickListener(mButtonClickListener);
mEditButton.setOnClickListener(mButtonClickListener); mEditButton.setOnClickListener(mButtonClickListener);
mAllowDiagonalScrollingTitle.setSelected(true);
mSettingView.setOnApplyWindowInsetsListener((v, insets) -> { mSettingView.setOnApplyWindowInsetsListener((v, insets) -> {
// Adds a pending post check to avoiding redundant calculation because this callback // Adds a pending post check to avoiding redundant calculation because this callback