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

Commit 49cc754d authored by Sean Midford's avatar Sean Midford
Browse files

Created landscape layout for group empty view

Created a landscape layout for the empty view in groups, and
adjusted the dimens and integers so view displays correctly
in multiwindow mode.

Test: Manually tested new layouts in landscape, portrait,
multiview sizes and on tablets.

Bug: 33841666

Change-Id: I9fce9893ce6b0b854b9fc7dda8895e969e3b76e2
parent b8b86d1a
Loading
Loading
Loading
Loading
+59 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 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:id="@+id/empty_group"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:background="@color/empty_state_background"
    android:visibility="gone">

    <ImageView
        android:id="@+id/empty_group_image"
        android:layout_width="wrap_content"
        android:layout_height="0dp"
        android:layout_weight="1"
        android:paddingTop="@dimen/empty_group_view_image_padding_top"
        android:scaleType="centerInside"
        android:adjustViewBounds="true"
        android:src="@drawable/label_empty"/>

    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="0dp"
        android:layout_weight="1"
        android:layout_gravity="center_horizontal"
        android:orientation="vertical">

        <TextView
            android:id="@+id/empty_group_view_text"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center_horizontal"
            android:paddingTop="@dimen/empty_group_view_text_padding_top"
            android:text="@string/emptyGroup"
            style="@style/EmptyStateTextStyle"/>

        <Button
            android:id="@+id/add_member_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center_horizontal"
            android:text="@string/menu_addContactsToGroup"
            style="@style/AddContactsButtonStyle"/>
    </LinearLayout>
</LinearLayout>
 No newline at end of file
+14 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 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:id="@+id/empty_group"
+5 −5
Original line number Diff line number Diff line
@@ -195,13 +195,13 @@
    <dimen name="nav_new_badge_font_size">11sp</dimen>

    <!-- Top padding for the image for empty group view-->
    <dimen name="empty_group_view_image_padding_top">8dp</dimen>
    <dimen name="empty_group_view_image_padding_top">0dp</dimen>

    <!-- Height for the image for empty group and main view-->
    <dimen name="empty_view_image_height">180dp</dimen>
    <dimen name="empty_view_image_height">150dp</dimen>

    <!-- Top padding for the text for empty group view-->
    <dimen name="empty_group_view_text_padding_top">32dp</dimen>
    <dimen name="empty_group_view_text_padding_top">14dp</dimen>

    <!-- Top padding for the text for empty account view -->
    <dimen name="empty_account_view_text_padding_top">24dp</dimen>