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

Commit df4336c1 authored by Mindy Pereira's avatar Mindy Pereira
Browse files

More adjustments to quick contacts to fixup layout. 

1) make website 1 line and ellipsize
2) give 12dip margin on top and bottom of all text

More fixes for bug:5233213 Quick contacts still needs some UI fixes
Change-Id: Ibba14d51bee44ca4e551ca411693035a5a45d57c
parent 1a817f04

res/layout/quickcontact_list_item.xml

+4 −39
Original line number Diff line number Diff line
@@ -17,22 +17,9 @@ 
<LinearLayout

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

    android:id="@+id/actions_view_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:orientation="horizontal"

    android:gravity="center_vertical"

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

    android:nextFocusRight="@+id/secondary_action_button">

    <LinearLayout

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingLeft="16dip"

        android:paddingRight="16dip"

        android:gravity="center_vertical"

        android:orientation="vertical"

    >

    android:nextFocusRight="@+id/secondary_action_button"

    style="@style/QuickContactListItemStyle">

    <LinearLayout style="@style/QuickContactListItemTextWrapperStyle">

        <TextView

            android:id="@android:id/text1"

            android:layout_width="wrap_content"
@@ -47,27 +34,5 @@ 
            android:textAllCaps="true"

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

    </LinearLayout>

    <View

        android:id="@+id/vertical_divider"

        android:layout_width="1dip"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:layout_marginTop="@dimen/detail_vertical_divider_vertical_margin"

        android:layout_marginBottom="@dimen/detail_vertical_divider_vertical_margin"

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

    <ImageView

        android:id="@+id/secondary_action_button"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingLeft="@dimen/detail_item_icon_margin"

        android:paddingRight="@dimen/detail_item_icon_margin"

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

        android:duplicateParentState="false"

        android:nextFocusLeft="@id/actions_view_container" />

    <View

        android:id="@+id/vertical_divider"

        android:layout_width="1dip"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

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

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

</LinearLayout>

res/layout/quickcontact_list_item_base.xml

0 → 100644
+41 −0
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.

-->



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

    <View

        android:id="@+id/vertical_divider"

        android:layout_width="1dip"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:layout_marginTop="@dimen/detail_vertical_divider_vertical_margin"

        android:layout_marginBottom="@dimen/detail_vertical_divider_vertical_margin"

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

    <ImageView

        android:id="@+id/secondary_action_button"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingLeft="@dimen/detail_item_icon_margin"

        android:paddingRight="@dimen/detail_item_icon_margin"

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

        android:duplicateParentState="false"

        android:nextFocusLeft="@id/actions_view_container" />

    <View

        android:id="@+id/vertical_divider"

        android:layout_width="1dip"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

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

</merge>

res/layout/quickcontact_list_item_email.xml

0 → 100755
+40 −0
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:id="@+id/actions_view_container"

    android:nextFocusRight="@+id/secondary_action_button"

    style="@style/QuickContactListItemStyle">

    <LinearLayout style="@style/QuickContactListItemTextWrapperStyle">

        <TextView

            android:id="@android:id/text1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@color/primary_text_color"

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

            android:singleLine="true"

            android:ellipsize="middle" />

        <TextView

            android:id="@android:id/text2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@color/secondary_text_color"

            android:textAllCaps="true"

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

    </LinearLayout>

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

</LinearLayout>

res/layout/quickcontact_list_item_website.xml

0 → 100755
+33 −0
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:id="@+id/actions_view_container"

    android:nextFocusRight="@+id/secondary_action_button"

    style="@style/QuickContactListItemStyle">

    <LinearLayout style="@style/QuickContactListItemTextWrapperStyle">

        <TextView

            android:id="@android:id/text1"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textColor="@color/primary_text_color"

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

            android:ellipsize="middle"

            android:singleLine="true" />

    </LinearLayout>

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

</LinearLayout>

res/values/styles.xml

+20 −0
Original line number Diff line number Diff line
@@ -263,4 +263,24 @@ 
        <item name="android:displayOptions"></item>

    </style>



    <style name="QuickContactListItemStyle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>

        <item name="android:orientation">horizontal</item>

        <item name="android:gravity">center_vertical</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>



    <style name="QuickContactListItemTextWrapperStyle">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_weight">1</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:gravity">center_vertical</item>

        <item name="android:orientation">vertical</item>

        <item name="android:layout_marginTop">12dip</item>

        <item name="android:layout_marginBottom">12dip</item>

    </style>

</resources>