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

Commit b76ab8b3 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Adding "empty" message in empty state"

parents a67b1812 66606b64

res/layout/contact_tile_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center_horizontal"

        android:textAppearance="?android:attr/textAppearanceLarge"/>

        android:layout_marginTop="@dimen/empty_message_top_margin"

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



</FrameLayout>

res/layout/contacts_unavailable_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:id="@+id/message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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

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

            android:layout_marginBottom="20dip" />



        <Button

res/layout/group_browse_list_fragment.xml

+35 −7
Original line number Diff line number Diff line
@@ -33,10 +33,38 @@ 


    <TextView

      android:id="@+id/empty"

      android:layout_marginTop="@dimen/empty_message_top_margin"

      android:layout_width="match_parent"

     android:layout_height="match_parent"

      android:layout_height="wrap_content"

      android:gravity="center_horizontal"

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

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



    <LinearLayout

      android:id="@+id/add_accounts"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:orientation="vertical">



      <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:layout_marginTop="@dimen/no_accounts_message_margin"

        android:layout_marginBottom="@dimen/no_accounts_message_margin"

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

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



      <Button

        android:id="@+id/add_account_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@dimen/add_account_button_left_margin"

        android:layout_marginRight="@dimen/add_account_button_right_margin"

        android:gravity="center"

     android:text="@string/noGroups"

     android:visibility="gone"/>

        android:layout_gravity="center_horizontal"

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

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



    </LinearLayout>

</LinearLayout>

res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -225,4 +225,10 @@ 
    <dimen name="call_detail_contact_background_overlay_height">42dip</dimen>

    <dimen name="call_detail_contact_name_margin">24dip</dimen>

    <dimen name="call_detail_action_bar_height">60dip</dimen>



    <!-- Empty message margins -->

    <dimen name="empty_message_top_margin">43dip</dimen>

    <dimen name="no_accounts_message_margin">15dip</dimen>

    <dimen name="add_account_button_left_margin">50dip</dimen>

    <dimen name="add_account_button_right_margin">50dip</dimen>

</resources>

res/values/strings.xml

+7 −4
Original line number Diff line number Diff line
@@ -287,11 +287,14 @@ 
    <!-- The menu item that allows you to remove a photo from a contact [CHAR LIMIT=50] -->

    <string name="removePhoto">Remove photo</string>



    <!-- The text displayed when the contacts list is empty while displaying all contacts -->

    <string name="noContacts">No contacts.</string>

    <!-- The text displayed when the contacts list is empty while displaying all contacts [CHAR LIMIT=NONE] -->

    <string name="noContacts">No contacts</string>



    <!-- The text displayed when the groups list is empty while displaying all groups [CHAR LIMIT=NONE] -->

    <string name="noGroups">No groups.</string>

    <string name="noGroups">No groups</string>



    <!-- The text displayed when the groups list is empty and no accounts are set on the device while displaying all groups [CHAR LIMIT=NONE] -->

    <string name="noAccounts">To create groups you need an account</string>



    <!-- The text displayed when the contacts list is empty while displaying results after searching contacts -->

    <string name="noMatchingContacts">No matching contacts found.</string>
@@ -358,7 +361,7 @@ 
    <string name="listTotalAllContactsZeroCustom">No visible contacts</string>



    <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when starred contact list is selected  [CHAR LIMIT=64]-->

    <string name="listTotalAllContactsZeroStarred">No starred contacts</string>

    <string name="listTotalAllContactsZeroStarred">No Favorites</string>



    <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when a group or account is selected  [CHAR LIMIT=64]-->

    <string name="listTotalAllContactsZeroGroup">No contacts in <xliff:g id="name" example="Friends">%s</xliff:g></string>