Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b51bb5 authored by Josh Gargus's avatar Josh Gargus Committed by Android (Google) Code Review
Browse files

Merge "Fix broken touch-interception in ContactDetailFragmentCarousel."

parents e19458e8 7edad9dd

res/layout-sw580dp/contact_detail_updates_fragment.xml

+0 −15
Original line number Diff line number Diff line
@@ -26,19 +26,4 @@ 
        android:fadingEdge="none"

        android:divider="@null"/>



    <View

        android:id="@+id/alpha_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@android:color/black"

        android:alpha=".50"

        android:visibility="gone"/>



    <View

        android:id="@+id/touch_intercept_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@android:color/transparent"

        android:visibility="gone"/>



</FrameLayout>

res/layout-w470dp/contact_detail_fragment.xml

+0 −15
Original line number Diff line number Diff line
@@ -71,20 +71,5 @@ 
            android:lineSpacingMultiplier="0.92"/>

    </ScrollView>



    <View

        android:id="@+id/alpha_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"/>



    <View

        android:id="@+id/touch_intercept_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:background="?android:attr/selectableItemBackground"

        android:visibility="gone"/>

</RelativeLayout>

res/layout-w470dp/contact_detail_updates_fragment.xml

+0 −16
Original line number Diff line number Diff line
@@ -25,20 +25,4 @@ 
        android:fadingEdge="none"

        android:divider="@null"/>



    <View

        android:id="@+id/alpha_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"/>



    <View

        android:id="@+id/touch_intercept_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:background="?android:attr/selectableItemBackground"

        android:visibility="gone"/>



</FrameLayout>

res/layout/carousel_about_tab.xml

+38 −32
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
    android:layout_height="match_parent"

    android:layout_weight="1">



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent" >



        <ImageView android:id="@+id/photo"

            android:scaleType="centerCrop"

            android:layout_width="match_parent"
@@ -58,4 +62,6 @@ 
            android:textColor="@color/detail_tab_carousel_tab_label_color"

            style="@android:style/Widget.Holo.ActionBar.TabView" />



    </RelativeLayout>



</view>

res/layout/carousel_updates_tab.xml

+55 −49
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
    android:layout_weight="1"

    android:background="@drawable/bg_people_updates_holo">



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent" >



        <ImageView android:id="@+id/status_photo"

            android:scaleType="centerCrop"

            android:layout_width="match_parent"
@@ -81,4 +85,6 @@ 
            android:textColor="@color/detail_tab_carousel_tab_label_color"

            style="@android:style/Widget.Holo.ActionBar.TabView" />



    </RelativeLayout>



</view>