commit 5f697e2f1815190f8488b73d6a2fdc4f6d1fbe48
author Paul Soulos <psoulos@google.com> Mon Sep 08 16:05:37 2014 -0700
committer Paul Soulos <psoulos@google.com> Tue Sep 09 00:06:59 2014 +0000
tree 8217735f62f46b3efe5777892976ad63f2516ae5
parent 9e1774c9ac0c32d87ced6c0881bab4f498954841

Adds solid background to N9 in portrait

bug: 17379653
Change-Id: I2be70fc07ca05f8c1b59f47bf6afc7358dd2716d

res/layout-sw720dp/quickcontact_activity.xml

diff --git a/res/layout-sw720dp/quickcontact_activity.xml b/res/layout-sw720dp/quickcontact_activity.xml
index efbb4d1..5a7d90a 100644
--- a/res/layout-sw720dp/quickcontact_activity.xml
+++ b/res/layout-sw720dp/quickcontact_activity.xml
@@ -27,45 +27,52 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:orientation="vertical" >
 
         <View
-            android:id="@+id/empty_start_column"
-            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: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="0dp"
-            android:layout_weight="@integer/contact_list_card_layout_weight"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
             <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:id="@+id/empty_start_column"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:id="@+id/toolbar_parent">
-                <include layout="@layout/quickcontact_header" />
-            </FrameLayout>
+                android:layout_weight="@integer/contact_list_space_layout_weight"
+                android:background="@color/background_primary"
+                android:focusable="false" />
 
-            <include layout="@layout/quickcontact_content" />
+            <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" >
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/toolbar_parent">
+                    <include layout="@layout/quickcontact_header" />
+                </FrameLayout>
 
+                <include layout="@layout/quickcontact_content" />
+            </LinearLayout>
+
+            <View
+                android:id="@+id/empty_end_column"
+                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>
-
-        <View
-            android:id="@+id/empty_end_column"
-            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" />
-
     </LinearLayout>
 
     <!-- This title's maximum height must be less than the minimum size of its

src/com/android/contacts/widget/MultiShrinkScroller.java

diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 47b6d6f..f5bd2a2 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -275,21 +275,7 @@
         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;