Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bac28be authored by Walter Jang's avatar Walter Jang
Browse files

Remove full editor (1/2) 

Test: Tested the following editor scenarios:
  1) new contact
  2) edit other contact
  3) edit writable raw contact
  4) edit read-only raw contact (joins a new writable raw contact to it)
  5) edit aggregate w/ 1 writable and 1 read-only raw contact
  6) edit aggregate w/ 2 writable raw contacts
  7) edit local me raw contact
  8) edit local me raw contact joined with a read-only raw contact

Bug: 31088704
Change-Id: I1fce2873facefa39d7b468f1deda02acc674e3e1
parent d428026d

AndroidManifest.xml

+0 −23
Original line number Diff line number Diff line
@@ -380,29 +380,6 @@ 
            </intent-filter>

        </activity>



        <!-- Edit or create a contact with all fields displayed. -->

        <activity

            android:name=".activities.ContactEditorActivity"

            android:theme="@style/EditorActivityTheme"

            android:windowSoftInputMode="stateHidden|adjustResize"

            android:exported="false">



            <intent-filter>

                <action android:name="com.android.contacts.action.FULL_EDIT" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.item/person" />

                <data android:mimeType="vnd.android.cursor.item/contact" />

                <data android:mimeType="vnd.android.cursor.item/raw_contact" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.contacts.action.FULL_INSERT" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.dir/person" />

                <data android:mimeType="vnd.android.cursor.dir/contact" />

                <data android:mimeType="vnd.android.cursor.dir/raw_contact" />

            </intent-filter>

        </activity>



        <activity android:name=".common.test.FragmentTestActivity">

            <intent-filter>

                <category android:name="android.intent.category.TEST" />

res/layout-sw600dp-land/contact_editor_activity.xml

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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.

-->



<!-- This should be kept in sync with layout-sw720dp/contact_editor_activity.xml -->

<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:baselineAligned="false">



        <!-- Empty view to represent the left margin -->

        <View

            android:layout_height="match_parent"

            android:layout_width="0dip"

            android:layout_weight="@integer/contact_list_space_layout_weight" />



        <fragment class="com.android.contacts.editor.ContactEditorFragment"

            android:id="@+id/contact_editor_fragment"

            android:layout_width="0dip"

            android:layout_weight="@integer/contact_list_card_layout_weight"

            android:layout_height="match_parent"/>



        <!-- Empty view to represent the right margin -->

        <View

            android:layout_height="match_parent"

            android:layout_width="0dip"

            android:layout_weight="@integer/contact_list_space_layout_weight" />



    </LinearLayout>



</ScrollView>

res/layout-sw600dp/contact_editor_activity.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?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.

-->



<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true">



    <fragment class="com.android.contacts.editor.ContactEditorFragment"

        android:id="@+id/contact_editor_fragment"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>



</ScrollView>

res/layout-sw600dp/contact_editor_fragment.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2007 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.

-->



<com.android.contacts.widget.InterpolatingLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:ex="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/contact_all_list_background_color"

    android:elevation="@dimen/contact_list_card_elevation">



    <LinearLayout

        android:id="@+id/editors"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:fadingEdge="none"

        ex:layout_wideParentWidth="800dip"

        ex:layout_wideMarginLeft="128dip"

        ex:layout_wideMarginRight="128dip"

        ex:layout_narrowParentWidth="600dip"

        ex:layout_narrowMarginLeft="50dip"

        ex:layout_narrowMarginRight="50dip"/>



</com.android.contacts.widget.InterpolatingLayout>

res/layout-sw720dp/contact_editor_activity.xml

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<!-- This should be kept in sync with layout-sw600dp-land/contact_editor_activity.xml -->

<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:baselineAligned="false">



        <!-- Empty view to represent the left margin -->

        <View

            android:layout_height="match_parent"

            android:layout_width="0dip"

            android:layout_weight="@integer/contact_list_space_layout_weight" />



        <fragment class="com.android.contacts.editor.ContactEditorFragment"

            android:id="@+id/contact_editor_fragment"

            android:layout_width="0dip"

            android:layout_weight="@integer/contact_list_card_layout_weight"

            android:layout_height="match_parent"/>



        <!-- Empty view to represent the right margin -->

        <View

            android:layout_height="match_parent"

            android:layout_width="0dip"

            android:layout_weight="@integer/contact_list_space_layout_weight" />



    </LinearLayout>



</ScrollView>