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

Commit c3038940 authored by Raff Tsai's avatar Raff Tsai Committed by Android (Google) Code Review
Browse files

Merge "Fix talkback issue"

parents 5b689a51 6ff13962

res/layout/device_admin_add.xml

+5 −2
Original line number Diff line number Diff line
@@ -86,13 +86,16 @@ 
                    android:orientation="horizontal"

                    android:gravity="center_vertical">



                    <ImageView android:id="@+id/add_msg_expander"

                    <ImageView

                        android:id="@+id/add_msg_expander"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:importantForAccessibility="no"

                        android:gravity="center_vertical"

                        android:contentDescription="@null" />



                    <TextView android:id="@+id/add_msg"

                    <TextView

                        android:id="@+id/add_msg"

                        android:layout_width="fill_parent"

                        android:layout_height="wrap_content"

                        android:gravity="center_vertical"

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java

+0 −2
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ public class DeviceAdminAdd extends Activity { 
            }

        };

        mAddMsgExpander.setOnClickListener(onClickListener);

        mAddMsg.setOnClickListener(onClickListener);



        // Determine whether the message can be collapsed - getLineCount() gives the correct

        // number of lines only after a layout pass.
@@ -360,7 +359,6 @@ public class DeviceAdminAdd extends Activity { 
                        boolean hideMsgExpander = mAddMsg.getLineCount() <= maxLines;

                        mAddMsgExpander.setVisibility(hideMsgExpander ? View.GONE : View.VISIBLE);

                        if (hideMsgExpander) {

                            mAddMsg.setOnClickListener(null);

                            ((View)mAddMsgExpander.getParent()).invalidate();

                        }

                        mAddMsg.getViewTreeObserver().removeOnGlobalLayoutListener(this);