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

Commit 47d5caa2 authored by Walter Jang's avatar Walter Jang
Browse files

Update group editor styles and avatars for dogfood 

* Use standard action bar w/ done button placement
  matching that on the contact editor
* Replace group member QuickContactBadge avatar with
  letter tile to match avatars in the main contacts
  lists. Also put it on the left side.
* Make the name in each group member row clickable.
* Don't use a two panel screen in landscape any more.

Bug 18641067

Change-Id: Id45a6ceb0a138906078356fa71a72225add07ecf
parent aa968bb2

res/layout-land/group_editor_view.xml

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

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="8dip"

        android:paddingRight="8dip"

        android:paddingStart="8dip"

        android:paddingEnd="8dip"

        android:orientation="horizontal"

        >



        <EditText

            android:id="@+id/group_name"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="wrap_content"

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

            android:inputType="textCapWords"

            android:imeOptions="flagNoExtractUi|flagNoFullscreen"

            android:hint="@string/group_name_hint"

            android:minHeight="48dip"

            android:paddingRight="8dip"

            android:paddingEnd="8dip"

            />



        <LinearLayout

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:paddingLeft="8dip"

            android:paddingStart="8dip"

            android:orientation="vertical"

            >

            <include

                layout="@layout/group_editor_autocomplete_view"

                android:id="@+id/add_member_field"/>

            <include

                layout="@layout/group_editor_existing_member_list"

                android:id="@android:id/list"/>

        </LinearLayout>

    </LinearLayout>

</LinearLayout>

res/layout-sw600dp/external_group_editor_view.xml

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

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="50dip"

    android:paddingLeft="50dip"

    android:paddingRight="100dip"

    android:paddingStart="50dip"

    android:paddingEnd="100dip"

    android:orientation="horizontal"

    android:background="@color/background_primary">



    <LinearLayout

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:layout_weight="3"

        android:layout_marginRight="30dip"

        android:layout_marginEnd="30dip"

        android:orientation="vertical">



        <TextView

            android:id="@+id/read_only_warning"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="10dip"

            android:paddingLeft="10dip"

            android:paddingRight="10dip"

            android:paddingStart="10dip"

            android:paddingEnd="10dip"

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

            android:textColor="?android:attr/textColorTertiary"

            android:text="@string/group_read_only" />



        <include

            android:id="@+id/account_header"

            layout="@layout/editor_account_header"/>



        <TextView

            android:id="@+id/group_name"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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

            android:textColor="?android:attr/textColorTertiary"

            android:textStyle="bold"

            android:padding="10dip"/>



    </LinearLayout>



    <include

        layout="@layout/group_editor_existing_member_list"

        android:id="@android:id/list"

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:layout_weight="2"/>



</LinearLayout>

res/layout-sw600dp/group_editor_view.xml

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

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="32dip"

    android:paddingLeft="@dimen/group_editor_side_padding"

    android:paddingRight="@dimen/group_editor_side_padding"

    android:paddingStart="@dimen/group_editor_side_padding"

    android:paddingEnd="@dimen/group_editor_side_padding"

    android:orientation="horizontal"

    android:background="@color/background_primary">



    <LinearLayout

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:layout_weight="3"

        android:layout_marginRight="30dip"

        android:layout_marginEnd="30dip"

        android:orientation="vertical">



        <include

            android:id="@+id/account_header"

            layout="@layout/editor_account_header"/>



        <EditText

            android:id="@+id/group_name"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="48dip"

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

            android:inputType="textCapWords"

            android:hint="@string/group_name_hint"

            android:paddingLeft="16dip"

            android:paddingStart="16dip"/>



    </LinearLayout>



    <LinearLayout

        android:id="@+id/group_members"

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:layout_weight="2"

        android:orientation="vertical">



        <include

            android:id="@+id/spacer"

            layout="@layout/editor_account_header"

            android:visibility="invisible"/>



        <include

            layout="@layout/group_editor_autocomplete_view"

            android:id="@+id/add_member_field"/>



        <include

            layout="@layout/group_editor_existing_member_list"

            android:id="@android:id/list"/>



    </LinearLayout>



</LinearLayout>

res/layout/external_group_member_item.xml

+10 −11
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 
    android:layout_height="wrap_content"

    android:orientation="horizontal">



    <ImageView

        android:id="@+id/photo"

        android:layout_marginLeft="5dip"

        android:layout_marginRight="10dip"

        android:layout_marginStart="5dip"

        android:layout_marginEnd="10dip"

        android:layout_gravity="center_vertical"

        android:layout_width="50dip"

        android:layout_height="50dip" />



    <TextView

        android:id="@+id/name"

        android:layout_height="wrap_content"
@@ -34,15 +44,4 @@ 
        android:paddingLeft="@dimen/group_member_item_left_padding"

        android:paddingStart="@dimen/group_member_item_left_padding" />



    <QuickContactBadge

        android:id="@+id/badge"

        android:layout_marginLeft="5dip"

        android:layout_marginRight="10dip"

        android:layout_marginStart="5dip"

        android:layout_marginEnd="10dip"

        android:layout_gravity="center_vertical"

        android:layout_width="50dip"

        android:layout_height="50dip"

        style="?android:attr/quickContactBadgeStyleWindowMedium" />



</LinearLayout>

res/layout/group_member_item.xml

+10 −11
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 
    android:layout_height="wrap_content"

    android:orientation="horizontal">



    <ImageView

        android:id="@+id/photo"

        android:layout_marginLeft="5dip"

        android:layout_marginRight="10dip"

        android:layout_marginStart="5dip"

        android:layout_marginEnd="10dip"

        android:layout_gravity="center_vertical"

        android:layout_width="50dip"

        android:layout_height="50dip"/>



    <TextView

        android:id="@+id/name"

        android:layout_height="wrap_content"
@@ -34,17 +44,6 @@ 
        android:paddingLeft="@dimen/group_member_item_left_padding"

        android:paddingStart="@dimen/group_member_item_left_padding" />



    <QuickContactBadge

        android:id="@+id/badge"

        android:layout_marginLeft="5dip"

        android:layout_marginRight="10dip"

        android:layout_marginStart="5dip"

        android:layout_marginEnd="10dip"

        android:layout_gravity="center_vertical"

        android:layout_width="50dip"

        android:layout_height="50dip"

        style="?android:attr/quickContactBadgeStyleWindowMedium" />



    <include

        android:id="@+id/delete_button_container"

        layout="@layout/edit_delete_button"