diff options
| author | 2017-05-26 22:16:00 +0000 | |
|---|---|---|
| committer | 2017-05-26 22:16:00 +0000 | |
| commit | 6190ec9b03fc970ada298881ba9a9519bc37ac92 (patch) | |
| tree | 966bf7701dfa4abd5749b86ce57f86f7f0a85892 | |
| parent | d9251bad5b251a3247ec03a71a15aecdcfb2c1a3 (diff) | |
| parent | bacaffa497de1877657f9cb3f59a82e3955f0f75 (diff) | |
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
am: bacaffa497
Change-Id: I7306408f2de87edc16d091713eba777a8e58b0ac
| -rw-r--r-- | core/java/android/widget/ActivityChooserView.java | 3 | ||||
| -rw-r--r-- | core/res/res/layout/activity_chooser_view_list_item.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java index 9a39a17ce223..121a8c5f0251 100644 --- a/core/java/android/widget/ActivityChooserView.java +++ b/core/java/android/widget/ActivityChooserView.java @@ -24,6 +24,8 @@ import android.content.pm.ResolveInfo; 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.util.AttributeSet; import android.util.Log; @@ -403,6 +405,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod } popupWindow.getListView().setContentDescription(mContext.getString( R.string.activitychooserview_choose_application)); + popupWindow.getListView().setSelector(new ColorDrawable(Color.TRANSPARENT)); } } diff --git a/core/res/res/layout/activity_chooser_view_list_item.xml b/core/res/res/layout/activity_chooser_view_list_item.xml index 66e400a27395..4678f76c50e3 100644 --- a/core/res/res/layout/activity_chooser_view_list_item.xml +++ b/core/res/res/layout/activity_chooser_view_list_item.xml @@ -21,7 +21,7 @@ android:paddingStart="?attr/listPreferredItemPaddingStart" android:paddingEnd="?attr/listPreferredItemPaddingEnd" android:minWidth="196dip" - android:background="?attr/activatedBackgroundIndicator" + android:background="?attr/selectableItemBackground" android:orientation="vertical" > <LinearLayout |