From 760754ec6102bd00fce136398617ac1677073f94 Mon Sep 17 00:00:00 2001
From: Alex Kershaw <alexkershaw@google.com>
Date: Tue, 12 May 2020 11:32:23 +0100
Subject: [PATCH] Hide the top intent resolver divider when there are tabs

Fixes: 155174577
Test: manual
Change-Id: If35f4902e793767cbd38e1f5770d55c4e7b22872
---
 .../com/android/internal/app/ResolverActivity.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 84c833ea5ffe6..96692c66121a9 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1598,6 +1598,7 @@ public class ResolverActivity extends Activity implements
     }
 
     private void setupProfileTabs() {
+        maybeHideDivider();
         TabHost tabHost = findViewById(R.id.profile_tabhost);
         tabHost.setup();
         ViewPager viewPager = findViewById(R.id.profile_pager);
@@ -1646,6 +1647,17 @@ public class ResolverActivity extends Activity implements
         findViewById(R.id.resolver_tab_divider).setVisibility(View.VISIBLE);
     }
 
+    private void maybeHideDivider() {
+        if (!isIntentPicker()) {
+            return;
+        }
+        final View divider = findViewById(R.id.divider);
+        if (divider == null) {
+            return;
+        }
+        divider.setVisibility(View.GONE);
+    }
+
     /**
      * Callback called when user changes the profile tab.
      * <p>This method is intended to be overridden by subclasses.