Updated UI for custom contact filter
Change-Id: Iff60f009208cbe79115a54fdeb27633dbed22fad
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a3eba3b..4a2f95d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -313,7 +313,7 @@
<activity
android:name=".list.CustomContactListFilterActivity"
android:label="@string/custom_list_filter"
- android:theme="@style/ContactsPreferencesTheme" />
+ android:theme="@style/CustomContactListFilterTheme" />
<activity
android:name=".ui.ShowOrCreateActivity"
diff --git a/res/layout/contacts_preferences.xml b/res/layout/contact_list_filter_custom.xml
similarity index 89%
rename from res/layout/contacts_preferences.xml
rename to res/layout/contact_list_filter_custom.xml
index c8a1bcf..6c34fec 100644
--- a/res/layout/contacts_preferences.xml
+++ b/res/layout/contact_list_filter_custom.xml
@@ -16,8 +16,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ style="@style/CustomContactListFilterView"
android:orientation="vertical"
android:fillViewport="true">
@@ -38,14 +37,14 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/menu_done" />
+ android:text="@android:string/ok" />
<Button
android:id="@+id/btn_discard"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/menu_doNotSave" />
+ android:text="@android:string/cancel" />
</LinearLayout>
diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
index d0219a8..63d8297 100644
--- a/res/layout/directory_header.xml
+++ b/res/layout/directory_header.xml
@@ -17,7 +17,7 @@
<!-- Layout used for list section separators. -->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- style="DirectoryHeader"
+ style="@style/DirectoryHeader"
android:layout_width="match_parent"
android:layout_height="56dip"
>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 8abb44c..777e718 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -56,6 +56,14 @@
<style name="ContactsPreferencesTheme" parent="@android:Theme.Light.Holo">
</style>
+ <style name="CustomContactListFilterTheme" parent="@android:Theme.Holo.Dialog">
+ </style>
+
+ <style name="CustomContactListFilterView" parent="CustomContactListFilterTheme">
+ <item name="android:layout_width">400dip</item>
+ <item name="android:layout_height">600dip</item>
+ </style>
+
<style name="CallDetailActivityTheme" parent="@android:Theme.Dialog">
<item name="android:windowContentOverlay">@null</item>
</style>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5774f35..7653704 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1361,7 +1361,7 @@
<string name="list_filter_customize">Customize...</string>
<!-- Title of the activity that allows the user to customize filtering of contact list [CHAR LIMIT=128] -->
- <string name="custom_list_filter">Custom contact list</string>
+ <string name="custom_list_filter">Define custom view</string>
<!-- Title of the settings activity [CHAR LIMIT=64] -->
<string name="activity_title_settings">Settings</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 71b653a..e2a73ea 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -176,6 +176,14 @@
<style name="ContactsPreferencesTheme" parent="@android:Theme">
</style>
+ <style name="CustomContactListFilterTheme" parent="@android:Theme">
+ </style>
+
+ <style name="CustomContactListFilterView" parent="CustomContactListFilterTheme">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
+ </style>
+
<declare-styleable name="InterpolatingLayout_Layout">
<attr name="layout_narrowParentWidth" format="dimension"/>
<attr name="layout_narrowWidth" format="dimension"/>
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 4cb58af..5aa794f 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -95,7 +95,7 @@
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
- setContentView(R.layout.contacts_preferences);
+ setContentView(R.layout.contact_list_filter_custom);
mList = getExpandableListView();
mList.setHeaderDividersEnabled(true);