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

Commit 46cb310f authored by Gary Mai's avatar Gary Mai
Browse files

Show icon of account being saved to 

Remove unused layouts for various account header types and simplify to
two:
One for linked contacts (editor_all_rawcontacts_account_selector) which
displays a linked chain icon and one which displays the account icon and
an optional expander icon (editor_account_header). The account icon one
is used in the single account case and when creating a new contact.

Test:
Manual usage of the new selector:
1. Single account case
2. Linked account case shows linked chain with a selector dropdown
3. Creating a new contact shows icon of account being saved to
3b. 3 but with multiple accounts so the selector is visible 
3c. 3b with swapping accounts and making sure the icon updates correctly

Bug: 29455526
Change-Id: Ic7784cc6e77b934468795176ee774a5247cce9a9
parent fd866c06

res/layout-land/compact_contact_editor_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 
                android:orientation="vertical">



            <include layout="@layout/editor_all_rawcontacts_accounts_selector" />

            <include layout="@layout/compact_account_info" />

            <include layout="@layout/editor_account_selector" />

            <include layout="@layout/editor_account_header" />



            <include layout="@layout/compact_contact_editor_fields"/>

res/layout/compact_account_info.xml

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

-->



<!-- Copy of editor_account_header_expandable, but w/o the expand account button. -->

<LinearLayout

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

        android:id="@+id/account_container"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:minHeight="@dimen/editor_min_line_item_height"

        android:orientation="horizontal"

        android:background="?android:attr/selectableItemBackground"

        android:layout_marginBottom="@dimen/compact_editor_name_top_margin"

        android:visibility="gone"

        >





    <ImageView

            android:id="@+id/account_type_icon"

            style="@style/EditSelectorIconStyle"/>



    <LinearLayout

            android:layout_height="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_marginTop="@dimen/compact_editor_account_header_top_margin"

            android:layout_marginStart="@dimen/compact_editor_account_left_margin"

            android:layout_gravity="center_vertical"

            android:orientation="vertical"

            >



        <TextView

                android:id="@+id/account_type"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="16sp"

                android:singleLine="true"

                android:textColor="@color/primary_text_color"

                android:ellipsize="end"

                android:textAlignment="viewStart"

                />



        <TextView

                android:id="@+id/account_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="14sp"

                android:singleLine="true"

                android:textColor="@color/secondary_text_color"

                android:ellipsize="end"

                android:textAlignment="viewStart"

                />



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/layout/compact_contact_editor_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ 
            android:focusableInTouchMode="true"/>



        <include layout="@layout/editor_all_rawcontacts_accounts_selector" />

        <include layout="@layout/compact_account_info" />

        <include layout="@layout/editor_account_selector" />

        <include layout="@layout/editor_account_header" />



        <include layout="@layout/compact_contact_editor_fields" />

res/layout/editor_account_header.xml

+52 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project

<!--

     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.
@@ -16,58 +17,63 @@ 


<LinearLayout

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

    android:id="@+id/account_container"

        android:id="@+id/account_header_container"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

    android:minHeight="48dip"

    android:background="#EEEEEE"

        android:minHeight="@dimen/editor_min_line_item_height"

        android:orientation="horizontal"

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:gravity="center_vertical"

    android:paddingLeft="@dimen/account_container_left_padding"

    android:paddingRight="28dip"

    android:paddingStart="@dimen/account_container_left_padding"

    android:paddingEnd="28dip">

        android:paddingBottom="@dimen/compact_editor_name_top_margin"

        >





    <ImageView

            android:id="@+id/account_type_icon"

            style="@style/EditSelectorIconStyle"/>



    <LinearLayout

        android:id="@+id/account"

            android:layout_height="wrap_content"

        android:layout_width="0dip"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_marginTop="@dimen/compact_editor_account_header_top_margin"

            android:layout_marginStart="@dimen/compact_editor_account_left_margin"

            android:layout_gravity="center_vertical"

            android:orientation="vertical"

        android:background="?android:attr/selectableItemBackground">

            >



        <TextView

                android:id="@+id/account_type"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

                android:textSize="16sp"

                android:singleLine="true"

                android:textColor="@color/primary_text_color"

            android:ellipsize="end" />

                android:ellipsize="end"

                android:textAlignment="viewStart"

                />



        <TextView

                android:id="@+id/account_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

             android:textAppearance="?android:attr/textAppearanceSmall"

             android:textColor="@color/primary_text_color"

                android:textSize="14sp"

                android:singleLine="true"

             android:ellipsize="end" />

                android:textColor="@color/secondary_text_color"

                android:ellipsize="end"

                android:textAlignment="viewStart"

                />



    </LinearLayout>



    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent">



    <ImageView

             android:id="@+id/account_icon"

             android:layout_width="32dip"

             android:layout_height="32dip"

             android:layout_gravity="center_vertical" />



    </FrameLayout>



        android:id="@+id/account_expander_icon"

        android:src="@drawable/ic_menu_expander_minimized_holo_light"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical|end"

        android:layout_alignParentEnd="true"

        android:paddingStart="@dimen/editor_round_button_padding_left"

        android:paddingEnd="@dimen/editor_round_button_padding_right"

        android:paddingTop="@dimen/editor_round_button_padding_top"

        android:paddingBottom="@dimen/editor_round_button_padding_bottom"

        android:visibility="gone"/>

</LinearLayout>
 
 No newline at end of file

res/layout/editor_account_header_expandable.xml

deleted100644 → 0
+0 −86
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.

-->



<!-- Header at the top of a raw contact editor. This is clickable to expand/collapse the editor. -->

<LinearLayout

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

    android:id="@+id/account_header_container"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:background="?android:attr/selectableItemBackground"

    android:paddingStart="16dp"

    android:focusable="true"

    >



    <!-- TODO: consider making this a new style, like EditKindIconStyle -->

    <ImageView

        android:id="@android:id/icon"

        android:layout_width="@dimen/editor_kind_icon_size"

        android:layout_height="@dimen/editor_kind_icon_size"

        android:layout_marginEnd="28dp"

        android:layout_gravity="center_vertical"

        />



    <LinearLayout

        android:id="@+id/account_info"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_weight="1"

        android:paddingBottom="@dimen/editor_account_header_expandable_top_bottom_padding"

        android:paddingTop="@dimen/editor_account_header_expandable_top_bottom_padding"

        android:orientation="vertical"

        >



        <TextView

            android:id="@+id/account_type"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textSize="16sp"

            android:singleLine="true"

            android:textColor="@color/primary_text_color"

            android:ellipsize="end"

            android:textAlignment="viewStart"

            />



        <TextView

            android:id="@+id/account_name"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textSize="14sp"

            android:singleLine="true"

            android:textColor="@color/secondary_text_color"

            android:ellipsize="end"

            android:textAlignment="viewStart"

            />



    </LinearLayout>



    <ImageView

        android:id="@+id/expand_account_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:layout_gravity="center_vertical|end"

        android:clickable="false"

        android:paddingLeft="@dimen/editor_round_button_padding_left"

        android:paddingRight="@dimen/editor_round_button_padding_right"

        android:paddingStart="@dimen/editor_round_button_padding_left"

        android:paddingEnd="@dimen/editor_round_button_padding_right"

        android:paddingTop="@dimen/editor_round_button_padding_top"

        android:paddingBottom="@dimen/editor_round_button_padding_bottom"

        />



</LinearLayout>
 
 No newline at end of file