From d9b659aa5dfa4a3af96582ae49ba9ae145854a84 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Mon, 1 Oct 2012 15:59:01 -0400
Subject: find the disappearing settings, plus some layout.

Bug: 7242287
Bug: 7194713
Change-Id: I362c2ffa0d4cbc3be45d14ede1de5dbf39ec4d7f
---
 res/layout/album.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/res/layout/album.xml b/res/layout/album.xml
index ed27d43..86ed595 100644
--- a/res/layout/album.xml
+++ b/res/layout/album.xml
@@ -13,16 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
       android:id="@android:id/widget_frame"
       android:minHeight="48dp"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      android:gravity="center_vertical"
       android:background="?android:attr/selectableItemBackground" >
 
       <TextView
           android:id="@+id/title"
-          android:layout_width="match_parent"
+          android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginBottom="10dp"
           android:layout_marginLeft="20dp"
@@ -31,17 +33,18 @@
           android:layout_centerVertical="true"
           android:ellipsize="end"
           android:singleLine="true"
+          android:layout_weight="1"
           android:textAppearance="?android:attr/textAppearanceMedium" />
 
       <CheckBox
           android:id="@+id/enabled"
           android:layout_width="wrap_content"
-          android:layout_height="match_parent"
+          android:layout_height="wrap_content"
           android:layout_alignParentRight="true"
           android:layout_centerVertical="true"
-          android:layout_toRightOf="@android:id/title"
+          android:layout_weight="0"
           android:layout_marginRight="20dp"
           android:clickable="false"
           android:duplicateParentState="true" />
 
-</RelativeLayout>
+</LinearLayout>
-- 
cgit v1.2.3