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

Commit 5d61c1b9 authored by Katherine Kuan's avatar Katherine Kuan
Browse files

Fix layout for group editor for tablet

- Carry over the noneditable group changes from the phone
- Layout should be reversed on the tablet

Bug: 5062065
Bug: 5070780
Change-Id: I59f9085d02111fcf9fc16304ca7061e692412daa
parent b69a06fc
Loading
Loading
Loading
Loading
+67 −0
Original line number Diff line number Diff line
@@ -14,32 +14,54 @@
     limitations under the License.
-->

<!--
  Header for group editor that contains the account name, type, icon, as well
  as the group name field.
-->
<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:orientation="horizontal"
    android:background="@color/background_primary">

    <LinearLayout
        android:layout_width="0dip"
    android:layout_height="wrap_content"
    android:layout_weight="1"
    android:layout_marginLeft="80dip"
        android:layout_height="match_parent"
        android:layout_weight="3"
        android:layout_marginRight="30dip"
        android:orientation="vertical">

    <include
        layout="@layout/group_editor_account_header"
        android:id="@+id/account_header"/>
        <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:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorTertiary"
            android:text="@string/group_read_only" />

        <include
        layout="@layout/edit_divider"
        android:id="@+id/divider"/>
            android:id="@+id/account_header"
            layout="@layout/editor_account_header"/>

    <EditText
        <TextView
            android:id="@+id/group_name"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
        android:hint="@string/group_name_hint"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:inputType="textCapWords"/>
            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>
+24 −5
Original line number Diff line number Diff line
@@ -24,11 +24,34 @@
    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: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:textAppearance="?android:attr/textAppearanceMedium"
            android:textStyle="bold"
            android:inputType="textCapWords"
            android:hint="@string/group_name_hint"
            android:layout_marginBottom="5dip"/>

    </LinearLayout>

    <LinearLayout
        android:id="@+id/group_members"
        android:layout_width="0dip"
        android:layout_height="match_parent"
        android:layout_weight="1"
        android:layout_weight="2"
        android:orientation="vertical">

        <include
@@ -41,8 +64,4 @@

    </LinearLayout>

    <include
        layout="@layout/group_editor_header"
        android:id="@+id/header"/>

</LinearLayout>