Merge "Remove "recent_updates" string from values-w470dp folder" (1b26ca1b) · Commits · e / os / android_packages_apps_Contacts

res/layout-sw580dp-w1000dp/updates_header_contact.xml

+16 −2

Original line number	Diff line number	Diff line
		@@ -16,9 +16,23 @@

		<!--
		This is a header entry in the contact updates list.
		This is empty because there is no header in this case.
		-->
		<FrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="0dip"/>
		android:layout_height="wrap_content"
		android:focusable="false">

		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_height="32dip"
		android:paddingLeft="8dip"
		android:paddingRight="8dip"
		android:background="@drawable/list_section_divider_holo_custom"
		android:text="@string/recent_updates"
		android:textColor="@color/people_app_theme_color"
		android:textAllCaps="true"
		android:singleLine="true"
		android:ellipsize="end" />

		</FrameLayout>

+30 −10

Original line number	Diff line number	Diff line
		@@ -16,11 +16,16 @@

		<!--
		This is a header entry in the contact updates list.
		Add a first item that gives us enough space to show the carousel
		-->
		<view
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<!-- This blank view pushes the other content down because of the tab carousel -->
		<view
		class="com.android.contacts.widget.ProportionalLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -34,3 +39,18 @@
		android:layout_height="match_parent"/>

		</view>

		<!-- "Recent updates" header text -->
		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_height="32dip"
		android:paddingLeft="8dip"
		android:paddingRight="8dip"
		android:background="@drawable/list_section_divider_holo_custom"
		android:text="@string/recent"
		android:textColor="@color/people_app_theme_color"
		android:textAllCaps="true"
		android:singleLine="true"
		android:ellipsize="end" />

		</LinearLayout>
		No newline at end of file

+17 −2

Original line number	Diff line number	Diff line
		@@ -16,9 +16,24 @@

		<!--
		This is a header entry in the contact updates list.
		This is empty because there is no header in this case.
		-->
		<FrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="0dip"/>
		android:layout_height="32dip"
		android:paddingLeft="16dip"
		android:paddingRight="16dip"
		android:focusable="false">

		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:paddingLeft="8dip"
		android:paddingRight="8dip"
		android:background="@drawable/list_section_divider_holo_custom"
		android:text="@string/recent_updates"
		android:textColor="@color/people_app_theme_color"
		android:textAllCaps="true"
		android:singleLine="true"
		android:ellipsize="end" />

		</FrameLayout>

+36 −8

Original line number	Diff line number	Diff line
		@@ -16,11 +16,16 @@

		<!--
		This is a header entry in the contact updates list.
		Add a first item that gives us enough space to show the carousel
		-->
		<view
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<!-- This blank view pushes the other content down because of the tab carousel -->
		<view
		class="com.android.contacts.widget.ProportionalLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -33,3 +38,26 @@
		android:layout_height="match_parent"/>

		</view>

		<!-- "Recent" header text -->
		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="32dip"
		android:paddingLeft="16dip"
		android:paddingRight="16dip"
		android:focusable="false">

		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:paddingLeft="8dip"
		android:paddingRight="8dip"
		android:background="@drawable/list_section_divider_holo_custom"
		android:text="@string/recent"
		android:textColor="@color/people_app_theme_color"
		android:textAllCaps="true"
		android:singleLine="true"
		android:ellipsize="end" />

		</FrameLayout>

		</LinearLayout>
		No newline at end of file

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<!-- Copyright (C) 2006 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.
		-->

		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="recent_updates" msgid="2018245636796411442">"Onlangse opdaterings"</string>
		</resources>