Revert "Adds solid background to N9 in portrait"
This reverts commit 5f697e2f1815190f8488b73d6a2fdc4f6d1fbe48.
Change-Id: I30e4af9a2b6c8075be9f8a38a987dfd0a5114fed
diff --git a/res/layout-sw720dp/quickcontact_activity.xml b/res/layout-sw720dp/quickcontact_activity.xml
index 5a7d90a..efbb4d1 100644
--- a/res/layout-sw720dp/quickcontact_activity.xml
+++ b/res/layout-sw720dp/quickcontact_activity.xml
@@ -27,52 +27,45 @@
<LinearLayout
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" />
+ 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" />
<LinearLayout
- android:layout_width="match_parent"
+ android:layout_width="0dp"
+ android:layout_weight="@integer/contact_list_card_layout_weight"
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:background="@color/background_primary"
- android:focusable="false" />
+ 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"
+ <FrameLayout
+ android:layout_width="match_parent"
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>
+ android:id="@+id/toolbar_parent">
+ <include layout="@layout/quickcontact_header" />
+ </FrameLayout>
- <include layout="@layout/quickcontact_content" />
- </LinearLayout>
+ <include layout="@layout/quickcontact_content" />
- <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
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 15dca5c..570a24b 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -275,7 +275,21 @@
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;