Make it possible for View and Edit to be in a Dialog
Change-Id: I55e0f3d9369e638651034131812a590984ff2282
diff --git a/res/layout-xlarge/contact_editor_activity.xml b/res/layout-xlarge/contact_editor_activity.xml
new file mode 100644
index 0000000..906152c
--- /dev/null
+++ b/res/layout-xlarge/contact_editor_activity.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="600dip"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <fragment android:name="com.android.contacts.views.editor.ContactEditorFragment"
+ android:id="@+id/contact_editor_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="50dip"
+ android:orientation="horizontal"
+ android:gravity="center_horizontal">
+
+ <Button
+ android:id="@+id/done"
+ android:layout_width="150dip"
+ android:layout_height="match_parent"
+ android:text="@string/menu_done" />
+ <Button
+ android:id="@+id/revert"
+ android:layout_width="150dip"
+ android:layout_height="match_parent"
+ android:text="@string/menu_doNotSave" />
+ </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/item_contact_editor.xml b/res/layout/item_contact_editor.xml
index 7566b37..b75c82a 100644
--- a/res/layout/item_contact_editor.xml
+++ b/res/layout/item_contact_editor.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
-<!-- placed inside act_edit -->
<com.android.contacts.ui.widget.ContactEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 3f773f9..cc8682f 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -21,5 +21,7 @@
</style>
<style name="ContactsPreferencesTheme" parent="@android:Theme.Dialog">
</style>
-
+ <style name="TallTitleBarTheme" parent="@android:Theme.Dialog">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 309119f..25ea72b 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -69,4 +69,7 @@
<!-- For PhoneNumberMessageSendInteraction -->
<item type="id" name="dialog_phone_number_message_disambiguation"/>
+ <!-- Dialog Manager Ids -->
+ <item type="id" name="dialog_manager_id_1"/>
+ <item type="id" name="dialog_manager_id_2"/>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f4f962c..b7df91f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -107,10 +107,10 @@
<style name="ContactBrowserTheme" parent="@android:Theme">
</style>
-
+
<style name="ContactPickerTheme" parent="@android:Theme">
</style>
-
+
<style name="ContactsPreferencesTheme" parent="@android:Theme">
</style>
</resources>