commit 28f970f23d0b22cd8488a68c9bea01a24f9af494
author Christophe Beyls <software@digitalia.be> Fri Aug 04 17:13:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 04 17:13:47 2017 +0000
tree 8e99932500e8dd9bb8591ac3e2f5248672dd552a
parent 6361922d01e1f0d0fbc4e117f966fc3c833b161e
parent b796bfd4f2414460bd8112582fe0055632dad53a

Merge "Fixed AlertController not showing the title divider when a ListView is used in combination with a custom view." am: 461d9c4b4b am: 29e0996552 am: e1a23c7fa5
am: b796bfd4f2

Change-Id: Ife7c84346612f9c4300add1a99f585b6fcf52e58

v7/appcompat/src/android/support/v7/app/AlertController.java

diff --git a/v7/appcompat/src/android/support/v7/app/AlertController.java b/v7/appcompat/src/android/support/v7/app/AlertController.java
index 986baf3..5ff4537 100644
--- a/v7/appcompat/src/android/support/v7/app/AlertController.java
+++ b/v7/appcompat/src/android/support/v7/app/AlertController.java
@@ -501,10 +501,8 @@
 
             // Only show the divider if we have a title.
             View divider = null;
-            if (mMessage != null || mListView != null || hasCustomPanel) {
-                if (!hasCustomPanel) {
-                    divider = topPanel.findViewById(R.id.titleDividerNoCustom);
-                }
+            if (mMessage != null || mListView != null) {
+                divider = topPanel.findViewById(R.id.titleDividerNoCustom);
             }
 
             if (divider != null) {