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

Commit da7b9450 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 506ee390: Merge "Fix accessibility issues with dialpad" into klp-dev 

* commit '506ee390':
  Fix accessibility issues with dialpad
parents 3010c153 506ee390

res/layout/dialpad.xml

+6 −3
Original line number Original line Diff line number Diff line
@@ -36,7 +36,8 @@ 
            xmlns:android="http://schemas.android.com/apk/res/android"

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

            android:id="@+id/one"

            android:id="@+id/one"

            style="@style/DialtactsDialpadButtonStyle"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            android:clickable="true"

            android:focusable="true" >

            <LinearLayout

            <LinearLayout

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_height="match_parent"
@@ -85,7 +86,8 @@ 
            xmlns:android="http://schemas.android.com/apk/res/android"

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

            android:id="@+id/star"

            android:id="@+id/star"

            style="@style/DialtactsDialpadButtonStyle"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            android:clickable="true"

            android:focusable="true" >

            <TextView

            <TextView

                android:id="@id/dialpad_key_number"

                android:id="@id/dialpad_key_number"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"
@@ -101,7 +103,8 @@ 
            xmlns:android="http://schemas.android.com/apk/res/android"

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

            android:id="@+id/pound"

            android:id="@+id/pound"

            style="@style/DialtactsDialpadButtonStyle"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            android:clickable="true"

            android:focusable="true" >

            <TextView

            <TextView

                android:id="@id/dialpad_key_number"

                android:id="@id/dialpad_key_number"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

res/layout/dialpad_key.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,8 @@ 
<com.android.dialer.dialpad.DialpadKeyButton

<com.android.dialer.dialpad.DialpadKeyButton

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

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

    style="@style/DialtactsDialpadButtonStyle"

    style="@style/DialtactsDialpadButtonStyle"

    android:clickable="true" >

    android:clickable="true"

    android:focusable="true" >

    <LinearLayout

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

src/com/android/dialer/dialpad/DialpadFragment.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1704,6 +1704,7 @@ public class DialpadFragment extends Fragment 
            activity.showSearchBar();

            activity.showSearchBar();

        } else {

        } else {

            activity.hideSearchBar();

            activity.hideSearchBar();

            mDigits.requestFocus();

        }

        }

    }

    }