From a2cf6a1313e9e98882ab6be6dfe650c2cda914dd Mon Sep 17 00:00:00 2001
From: jasonwshsu <jasonwshsu@google.com>
Date: Tue, 31 Dec 2019 12:12:49 +0800
Subject: [PATCH] Accessibility shortcut secondary action - auto hide divider
 in shortcutPreference

- Hide divider when settings view is gone.

Bug: 142530063
Test: manual
Change-Id: I07c9aa628c4e300d1fd21fe5b87c18ff1c294e17
---
 res/layout/accessibility_shortcut_secondary_action.xml        | 1 +
 .../android/settings/accessibility/ShortcutPreference.java    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/layout/accessibility_shortcut_secondary_action.xml b/res/layout/accessibility_shortcut_secondary_action.xml
index b46c3030c42..caf9b1c5d12 100644
--- a/res/layout/accessibility_shortcut_secondary_action.xml
+++ b/res/layout/accessibility_shortcut_secondary_action.xml
@@ -87,6 +87,7 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/divider"
         android:layout_width="1dp"
         android:layout_height="match_parent"
         android:layout_marginTop="16dp"
diff --git a/src/com/android/settings/accessibility/ShortcutPreference.java b/src/com/android/settings/accessibility/ShortcutPreference.java
index f76bb01e745..b66a2b63c22 100644
--- a/src/com/android/settings/accessibility/ShortcutPreference.java
+++ b/src/com/android/settings/accessibility/ShortcutPreference.java
@@ -73,9 +73,11 @@ public class ShortcutPreference extends Preference {
         }
 
         final View settings = holder.itemView.findViewById(android.R.id.widget_frame);
-        if (settings != null) {
+        final View divider = holder.itemView.findViewById(R.id.divider);
+        if (settings != null && divider != null) {
             settings.setOnClickListener(view -> callOnSettingsClicked());
             settings.setVisibility(mSettingsVisibility);
+            divider.setVisibility(mSettingsVisibility);
         }
     }