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

Commit 585f7c1b authored by Casey Burkhardt's avatar Casey Burkhardt Committed by Android (Google) Code Review
Browse files

Merge "Minor UI adjustments to a11y button chooser" into oc-dev

parents 94ac6ae6 4c6436f8

core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.widget.ImageView; 
import android.widget.TextView;



import com.android.internal.R;

import com.android.internal.widget.ResolverDrawerLayout;



import java.util.ArrayList;

import java.util.Collections;
@@ -56,6 +57,11 @@ public class AccessibilityButtonChooserActivity extends Activity { 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.accessibility_button_chooser);



        final ResolverDrawerLayout rdl = findViewById(R.id.contentPanel);

        if (rdl != null) {

            rdl.setOnDismissedListener(this::finish);

        }



        String component = Settings.Secure.getString(getContentResolver(),

                Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT);

        if (TextUtils.isEmpty(component)) {

core/res/res/layout/accessibility_button_chooser.xml

+6 −10
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<com.android.internal.widget.ResolverDrawerLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:maxWidth="@dimen/resolver_max_width"

    android:maxCollapsedHeight="256dp"

    android:maxCollapsedHeightSmall="56dp"
@@ -27,11 +27,14 @@ 


    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_alwaysShow="true"

        android:orientation="vertical"

        android:background="?attr/colorBackground"

        android:paddingTop="8dp"

        android:paddingBottom="8dp">

        android:paddingBottom="8dp"

        android:paddingStart="?attr/dialogPreferredPadding"

        android:paddingEnd="?attr/dialogPreferredPadding">



        <TextView

            android:layout_width="match_parent"
@@ -41,8 +44,6 @@ 
            android:text="@string/accessibility_button_prompt_text"

            android:gravity="start|center_vertical"

            android:layout_alignParentStart="true"

            android:paddingStart="?attr/dialogPreferredPadding"

            android:paddingEnd="?attr/dialogPreferredPadding"

            android:paddingTop="8dp"

            android:paddingBottom="8dp"/>
@@ -55,20 +56,15 @@ 
            android:verticalSpacing="10dp"

            android:horizontalSpacing="10dp"

            android:stretchMode="columnWidth"

            android:paddingStart="?attr/dialogPreferredPadding"

            android:paddingEnd="?attr/dialogPreferredPadding"

            android:gravity="center"/>



        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:id="@+id/accessibility_button_prompt"

            android:layout_alwaysShow="true"

            android:textAppearance="?attr/textAppearanceMedium"

            android:text="@string/accessibility_button_instructional_text"

            android:gravity="start|center_vertical"

            android:paddingStart="?attr/dialogPreferredPadding"

            android:paddingEnd="?attr/dialogPreferredPadding"

            android:paddingTop="8dp"

            android:paddingBottom="8dp"

            android:visibility="gone"/>