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

Commit f693ce92 authored by Flavio Lerda's avatar Flavio Lerda Committed by Android (Google) Code Review
Browse files

Merge "Add title on top of updates."

parents a424cd98 942a2f2f

res/layout-sw580dp-w1000dp/contact_detail_updates_fragment.xml

+4 −17
Original line number Diff line number Diff line
@@ -14,22 +14,9 @@ 
     limitations under the License.

-->



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

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

    android:id="@+id/contact_detail_updates_fragment"

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:padding="16dip">



    <include

        android:id="@+id/title"

        layout="@layout/contact_detail_kind_title_entry_view" />



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

    android:background="@color/background_social_updates"

    android:divider="@null"/>
 


</LinearLayout>

res/layout-w470dp/contact_detail_updates_fragment.xml

+4 −15
Original line number Diff line number Diff line
@@ -20,23 +20,12 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <include

            android:id="@+id/title"

            layout="@layout/contact_detail_kind_title_entry_view" />



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/background_social_updates"

        android:divider="@null"/>



    </LinearLayout>



    <View

        android:id="@+id/alpha_overlay"

        android:layout_width="match_parent"

res/layout/contact_detail_updates_fragment.xml

+2 −8
Original line number Diff line number Diff line
@@ -14,17 +14,11 @@ 
     limitations under the License.

-->



<FrameLayout

<ListView

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

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

    android:id="@+id/contact_detail_updates_fragment"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



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

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/background_social_updates"

        android:divider="@null"/>
 


</FrameLayout>

res/layout/updates_title.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

 * Copyright 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="wrap_content"

    android:paddingLeft="@dimen/detail_item_side_margin"

    android:paddingRight="@dimen/detail_item_side_margin"

    android:orientation="vertical">



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="24dip"

        android:text="@string/recent_updates"

        android:textColor="@color/detail_kind_title_color"

        android:textStyle="bold"

        android:singleLine="true"

        android:ellipsize="end"

        android:paddingLeft="8dip"

        android:paddingTop="5dip"

        android:paddingBottom="2dip" />



    <View

        android:layout_width="match_parent"

        android:layout_height="2dip"

        android:background="@color/detail_kind_title_color"/>



</LinearLayout>

res/values-w470dp/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="recent_updates">Updates</string>

    <string name="recent_updates">Recent updates</string>

</resources>