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

Commit 59a3768f authored by Chiao Cheng's avatar Chiao Cheng Committed by Android (Google) Code Review
Browse files

Merge "Refactor editor layout file dependencies out of common."

parents 79ba0f02 5b12d1b5
Loading
Loading
Loading
Loading
+0 −53
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.
-->

<com.android.contacts.editor.TextFieldsEditorView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:orientation="horizontal"
        android:gravity="center_vertical"
        android:focusable="true"
        android:clickable="true">

        <include
            android:id="@+id/editors"
            layout="@layout/edit_field_list" />

        <include
            android:id="@+id/expansion_view_container"
            layout="@layout/edit_expansion_view"
            android:visibility="gone" />

        <include
            android:id="@+id/spinner"
            layout="@layout/edit_spinner"
            android:visibility="gone" />

        <include
            android:id="@+id/delete_button_container"
            layout="@layout/edit_delete_button"
            android:visibility="gone" />

    </LinearLayout>

</com.android.contacts.editor.TextFieldsEditorView>
+0 −31
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.
  -->

<!-- Button to select a date in the contact editor. -->

<Button
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/date_view"
    style="?android:attr/spinnerStyle"
    android:layout_width="0dip"
    android:layout_height="@dimen/editor_min_line_item_height"
    android:layout_weight="1"
    android:gravity="center_vertical"
    android:layout_marginLeft="@dimen/editor_field_left_padding"
    android:layout_marginRight="@dimen/editor_field_right_padding"
    android:textAppearance="?android:attr/textAppearanceMedium"
    android:paddingLeft="12dip" />
+0 −39
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.
  -->

<!-- "Delete field" button in the contact editor. -->

<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="@dimen/editor_min_line_item_height"
    android:layout_marginRight="2dip"
    android:layout_gravity="bottom">
    <ImageView
        android:id="@+id/delete_button"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:duplicateParentState="true"
        android:background="?android:attr/selectableItemBackground"
        android:src="@drawable/ic_menu_remove_field_holo_light"
        android:paddingLeft="@dimen/editor_round_button_padding_left"
        android:paddingRight="@dimen/editor_round_button_padding_right"
        android:paddingTop="@dimen/editor_round_button_padding_top"
        android:paddingBottom="@dimen/editor_round_button_padding_bottom"
        android:contentDescription="@string/description_minus_button" />
</FrameLayout>
+0 −36
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.
  -->

<!-- "More" or "less" expansion button in the contact editor. -->

<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="@dimen/editor_min_line_item_height"
    android:layout_gravity="top">
    <ImageView
        android:id="@+id/expansion_view"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:duplicateParentState="true"
        android:background="?android:attr/selectableItemBackground"
        android:paddingLeft="@dimen/editor_round_button_padding_left"
        android:paddingRight="@dimen/editor_round_button_padding_right"
        android:paddingTop="@dimen/editor_round_button_padding_top"
        android:paddingBottom="@dimen/editor_round_button_padding_bottom" />
</FrameLayout>
+0 −27
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.
  -->

<!-- Layout to contain a list of fields in the contact editor. -->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/editors"
    android:layout_width="0dip"
    android:layout_weight="1"
    android:layout_height="wrap_content"
    android:paddingLeft="@dimen/editor_field_left_padding"
    android:orientation="vertical" />
Loading