Move some contact editor functionality into new base classes

To make room for a new "compact" contact editor.

The Status and SaveMode interfaces in ContactEditorFragment were
moved to ContactEditorBaseActivity but the Listener interface
was moved to the ContactEditorBaseFragment.

The logic in ContactEditorFragment to construct the result
Intent after successful saves was alos moved to the
ContactEditorBaseFragment.

This reverts commit 02375f1e45ade453c56810f32d63dfe8eebe4f44.

Change-Id: Ib0129d9ba4e4351677b6979c5f720df2094bf48d

2 files changed, 58 insertions, 0 deletions

diff --git a/res/layout/compact_contact_editor_activity.xml b/res/layout/compact_contact_editor_activity.xml
new file mode 100644
index 000000000..bb89d0135
--- /dev/null
+++ b/res/layout/compact_contact_editor_activity.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <fragment android:id="@+id/compact_contact_editor_fragment"
+        class="com.android.contacts.editor.CompactContactEditorFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
+
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
new file mode 100644
index 000000000..eb245103b
--- /dev/null
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_primary"
+    android:fadingEdge="none"
+    android:fillViewport="true">
+
+    <LinearLayout android:id="@+id/editors"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+</ScrollView>