PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix talkback issue

Browse Source 
Fixes: 141226569
Test: manual
Change-Id: I631554ab33d6cc77f3d3f2e4625d359a802dd5b5
This commit is contained in:
Raff Tsai
2019-10-04 10:22:10 +08:00
parent a80a7c16f2
commit 6ff13962a3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/device_admin_add.xml
View File

@@ -86,13 +86,16 @@
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center_vertical"> 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:gravity="center_vertical" android:gravity="center_vertical"
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView android:id="@+id/add_msg" <TextView
android:id="@+id/add_msg"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"

2
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -347,7 +347,6 @@ public class DeviceAdminAdd extends Activity {
} }
}; };
mAddMsgExpander.setOnClickListener(onClickListener); mAddMsgExpander.setOnClickListener(onClickListener);
mAddMsg.setOnClickListener(onClickListener);
// Determine whether the message can be collapsed - getLineCount() gives the correct // Determine whether the message can be collapsed - getLineCount() gives the correct
// number of lines only after a layout pass. // number of lines only after a layout pass.
@@ -360,7 +359,6 @@ public class DeviceAdminAdd extends Activity {
boolean hideMsgExpander = mAddMsg.getLineCount() <= maxLines; boolean hideMsgExpander = mAddMsg.getLineCount() <= maxLines;
mAddMsgExpander.setVisibility(hideMsgExpander ? View.GONE : View.VISIBLE); mAddMsgExpander.setVisibility(hideMsgExpander ? View.GONE : View.VISIBLE);
if (hideMsgExpander) { if (hideMsgExpander) {
mAddMsg.setOnClickListener(null);
((View)mAddMsgExpander.getParent()).invalidate(); ((View)mAddMsgExpander.getParent()).invalidate();
} }
mAddMsg.getViewTreeObserver().removeOnGlobalLayoutListener(this); mAddMsg.getViewTreeObserver().removeOnGlobalLayoutListener(this);