Merge "Don't show ripple effect on the element replacing "See All"" into oc-support-26.0-dev
diff --git a/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml b/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml
index 887427d..cf8cb1a 100644
--- a/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml
+++ b/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml
@@ -21,7 +21,8 @@
android:paddingLeft="16dip"
android:paddingRight="16dip"
android:minWidth="196dip"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="?attr/selectableItemBackground" >
<LinearLayout
android:layout_width="wrap_content"
diff --git a/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java b/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java
index 94624ad..ddcb9fc 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java
@@ -25,6 +25,8 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.database.DataSetObserver;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.support.annotation.RestrictTo;
import android.support.v4.view.ActionProvider;
@@ -393,6 +395,7 @@
}
popupWindow.getListView().setContentDescription(getContext().getString(
R.string.abc_activitychooserview_choose_application));
+ popupWindow.getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
}
}