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

Commit bff36f7e authored by menghanli's avatar menghanli
Browse files

Sets the scroll indicators for edit shortcut dialog. 

- The indicators appears while content view is out of vision for vertical scrolling.

Bug: 142531156
Test: local test
Change-Id: Ifa1966b1df7628029976d27d72d2ae63d84e28c3
parent 5a8e9e45

res/layout/accessibility_edit_magnification_mode.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  -->



<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/container_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbarStyle="outsideOverlay">
@@ -24,8 +25,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:paddingEnd="24dp"

        android:paddingStart="24dp">

        android:padding="24dp">



        <TextView

            style="@style/AccessibilityDialogDescription"

res/layout/accessibility_edit_shortcut.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/container_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbarStyle="outsideOverlay">

res/layout/accessibility_edit_shortcut_magnification.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  -->



<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/container_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbarStyle="outsideOverlay">

src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java

+15 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.View; 
import android.widget.CheckBox;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.ScrollView;

import android.widget.TextView;



import androidx.annotation.ColorInt;
@@ -76,7 +77,7 @@ public class AccessibilityEditDialogUtils { 
        final AlertDialog alertDialog = createDialog(context, DialogType.EDIT_SHORTCUT_GENERIC,

                dialogTitle, listener);

        alertDialog.show();



        setScrollIndicators(alertDialog);

        return alertDialog;

    }
@@ -93,7 +94,7 @@ public class AccessibilityEditDialogUtils { 
        final AlertDialog alertDialog = createDialog(context,

                DialogType.EDIT_SHORTCUT_MAGNIFICATION, dialogTitle, listener);

        alertDialog.show();



        setScrollIndicators(alertDialog);

        return alertDialog;

    }
@@ -110,7 +111,7 @@ public class AccessibilityEditDialogUtils { 
        final AlertDialog alertDialog = createDialog(context,

                DialogType.EDIT_MAGNIFICATION_MODE, dialogTitle, listener);

        alertDialog.show();



        setScrollIndicators(alertDialog);

        return alertDialog;

    }
@@ -128,6 +129,17 @@ public class AccessibilityEditDialogUtils { 
        return alertDialog;

    }



    /**

     * Sets the scroll indicators for dialog view. The indicators appears while content view is

     * out of vision for vertical scrolling.

     */

    private static void setScrollIndicators(AlertDialog dialog) {

        final ScrollView scrollView = dialog.findViewById(R.id.container_layout);

        scrollView.setScrollIndicators(

                View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM,

                View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM);

    }



    /**

     * Get a content View for the edit shortcut dialog.

     *

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.view.accessibility.AccessibilityManager.TouchExplorationStateChan 
import android.widget.CheckBox;

import android.widget.ImageView;



import androidx.appcompat.app.AlertDialog;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;
@@ -242,7 +243,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
            case DialogEnums.EDIT_SHORTCUT:

                final CharSequence dialogTitle = getPrefContext().getString(

                        R.string.accessibility_shortcut_title, mPackageName);

                Dialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(

                final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(

                        getPrefContext(), dialogTitle, this::callOnAlertDialogCheckboxClicked);

                initializeDialogCheckBox(dialog);

                return dialog;