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

Commit a2802ba5 authored by Paul Soulos's avatar Paul Soulos Committed by Android Git Automerger
Browse files

am fffcf2a8: Revert "Adds solid background to N9 in portrait"

* commit 'fffcf2a8':
  Revert "Adds solid background to N9 in portrait"
parents 15ad72f8 fffcf2a8
Loading
Loading
Loading
Loading
+27 −34
Original line number Diff line number Diff line
@@ -24,17 +24,6 @@
    android:focusableInTouchMode="true"
    android:descendantFocusability="afterDescendants" >

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical" >

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/quickcontact_starting_empty_height"
            android:contentDescription="@string/quickcontact_transparent_view_description"
            android:id="@+id/transparent_view" />

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@@ -45,16 +34,20 @@
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="@integer/contact_list_space_layout_weight"
                android:background="@color/background_primary"
                android:focusable="false" />
            android:contentDescription="@string/quickcontact_transparent_view_description" />

        <LinearLayout
            android:layout_width="0dp"
                android:layout_height="match_parent"
            android:layout_weight="@integer/contact_list_card_layout_weight"
                android:orientation="vertical"
                android:elevation="@dimen/contact_list_card_elevation"
                android:outlineProvider="bounds" >
            android:layout_height="match_parent"
            android:orientation="vertical">

            <View
                android:layout_width="match_parent"
                android:layout_height="@dimen/quickcontact_starting_empty_height"
                android:contentDescription="@string/quickcontact_transparent_view_description"
                android:id="@+id/transparent_view" />

            <FrameLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -63,6 +56,7 @@
            </FrameLayout>

            <include layout="@layout/quickcontact_content" />

        </LinearLayout>

        <View
@@ -70,9 +64,8 @@
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="@integer/contact_list_space_layout_weight"
                android:background="@color/background_primary"
                android:focusable="false" />
        </LinearLayout>
            android:contentDescription="@string/quickcontact_transparent_view_description" />

    </LinearLayout>

    <!-- This title's maximum height must be less than the minimum size of its
+15 −1
Original line number Diff line number Diff line
@@ -275,7 +275,21 @@ public class MultiShrinkScroller extends FrameLayout {
        mLargeTextView = (TextView) findViewById(R.id.large_title);
        mInvisiblePlaceholderTextView = (TextView) findViewById(R.id.placeholder_textview);
        mStartColumn = findViewById(R.id.empty_start_column);

        // Touching the empty space should close the card
        if (mStartColumn != null) {
            mStartColumn.setOnClickListener(new OnClickListener() {
                @Override
                public void onClick(View v) {
                    scrollOffBottom();
                }
            });
            findViewById(R.id.empty_end_column).setOnClickListener(new OnClickListener() {
                @Override
                public void onClick(View v) {
                    scrollOffBottom();
                }
            });
        }
        mListener = listener;
        mIsOpenContactSquare = isOpenContactSquare;