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

Commit 5f697e2f authored by Paul Soulos's avatar Paul Soulos
Browse files

Adds solid background to N9 in portrait

bug: 17379653
Change-Id: I2be70fc07ca05f8c1b59f47bf6afc7358dd2716d
parent 9e1774c9
Loading
Loading
Loading
Loading
+34 −27
Original line number Diff line number Diff line
@@ -24,6 +24,17 @@
    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"
@@ -34,20 +45,16 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="@integer/contact_list_space_layout_weight"
            android:contentDescription="@string/quickcontact_transparent_view_description" />
                android:background="@color/background_primary"
                android:focusable="false" />

            <LinearLayout
                android:layout_width="0dp"
            android:layout_weight="@integer/contact_list_card_layout_weight"
                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" />

                android:layout_weight="@integer/contact_list_card_layout_weight"
                android:orientation="vertical"
                android:elevation="@dimen/contact_list_card_elevation"
                android:outlineProvider="bounds" >
                <FrameLayout
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
@@ -56,7 +63,6 @@
                </FrameLayout>

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

            </LinearLayout>

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

                android:background="@color/background_primary"
                android:focusable="false" />
        </LinearLayout>
    </LinearLayout>

    <!-- This title's maximum height must be less than the minimum size of its
+1 −15
Original line number Diff line number Diff line
@@ -275,21 +275,7 @@ 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;