Segment album list by account.

Bug: 7162806
Change-Id: I3a7f2c1a9e9d0ff299f4d5a8536013b9ec8f52ba

3 files changed, 55 insertions, 4 deletions

diff --git a/res/layout/album.xml b/res/layout/album.xml
index 890d96c..ee96c6c 100644
--- a/res/layout/album.xml
+++ b/res/layout/album.xml
@@ -13,7 +13,34 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" >
-  <CheckBox android:id="@+id/enabled" />
-</LinearLayout >
+<RelativeLayout 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:background="?android:attr/selectableItemBackground" >
+
+      <TextView
+          android:id="@+id/title"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="10dp"
+          android:layout_marginLeft="20dp"
+          android:layout_marginRight="6dp"
+          android:layout_marginTop="10dp"
+          android:layout_centerVertical="true"
+          android:ellipsize="end"
+          android:singleLine="true"
+          android:textAppearance="?android:attr/textAppearanceMedium" />
+
+      <CheckBox
+          android:id="@+id/enabled"
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:layout_alignParentRight="true"
+          android:layout_centerVertical="true"
+          android:layout_toRightOf="@android:id/title"
+          android:layout_marginRight="20dp"
+          android:duplicateParentState="true" />
+
+</RelativeLayout>
diff --git a/res/layout/header.xml b/res/layout/header.xml
new file mode 100644
index 0000000..29aa1ce
--- /dev/null
+++ b/res/layout/header.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:singleLine="true"
+    style="?android:attr/listSeparatorTextViewStyle"
+    android:ellipsize="end"
+    />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2334b53..d42b7cc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,5 +21,6 @@
     <string name="uploads_album_name">Instant Uploads</string>
     <string name="unknown_album_name">Unnamed Album</string>
     <string name="stock_photo_album_name">Stock Photos</string>
+    <string name="local_source_name">Photos on Device</string>
     <string name="stock_photo_thumbnail_url">https://lh4.googleusercontent.com/-Wd4RWlOXkSo/STt6r8uEJBI/AAAAAAAABJk/2An3QS-aD5c/s256/044_002.jpg</string>
 </resources>