Merge "Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on" (cb1f6074) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/ContactHeaderWidget.java

deleted100644 → 0

+0 −727

File deleted.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable-hdpi/ic_aggregated.png

deleted100644 → 0

−883 B

Loading image diff...

core/res/res/drawable-mdpi/ic_aggregated.png

deleted100644 → 0

−671 B

Loading image diff...

core/res/res/layout/contact_header.xml

deleted100644 → 0

+0 −116

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2009 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/banner"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:background="@drawable/title_bar_medium"
		android:paddingRight="5dip">

		<android.widget.QuickContactBadge android:id="@+id/photo"
		android:layout_gravity="center_vertical"
		android:layout_marginRight="8dip"
		android:layout_marginLeft="-1dip"
		style="@*android:style/Widget.QuickContactBadge.WindowSmall" />
		/>

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

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal">

		<ImageView
		android:id="@+id/aggregate_badge"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingRight="3dip"
		android:paddingTop="3dip"
		android:src="@drawable/ic_aggregated"
		android:visibility="gone"
		/>

		<TextView android:id="@+id/name"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="end"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textStyle="bold"
		android:shadowColor="#BB000000"
		android:shadowRadius="2.75"
		/>
		</LinearLayout>

		<TextView android:id="@+id/phonetic_name"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:singleLine="true"
		android:ellipsize="end"
		android:layout_marginTop="-2dip"
		android:visibility="gone"
		/>

		<TextView android:id="@+id/status"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:singleLine="true"
		android:ellipsize="end"
		android:layout_marginTop="-2dip"
		android:visibility="gone"
		/>

		<TextView android:id="@+id/status_date"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textSize="12sp"
		android:layout_marginTop="-2dip"
		android:visibility="gone"
		/>
		</LinearLayout>

		<ImageView
		android:id="@+id/presence"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:paddingLeft="3dip"
		android:paddingRight="6dip"
		android:visibility="gone"
		/>

		<CheckBox
		android:id="@+id/star"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:visibility="gone"
		android:contentDescription="@string/description_star"
		style="?android:attr/starStyle" />

		</LinearLayout>

core/res/res/values/strings.xml

+0 −12

Original line number	Diff line number	Diff line
		@@ -1421,12 +1421,6 @@
		<!-- Custom organization type -->
		<string name="orgTypeCustom">Custom</string>

		<!-- Attbution of a contact status update, when the time of update is unknown -->
		<string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>

		<!-- Attbution of a contact status update, when the time of update is known -->
		<string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>

		<!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
		Displayed in one line in a large font. -->
		<string name="keyguard_password_enter_pin_code">Enter PIN code</string>
		@@ -2270,12 +2264,6 @@
		<!-- Label for <input type="submit"> button in html -->
		<string name="submit">Submit</string>

		<!-- String describing the Star/Favorite checkbox

		Used by AccessibilityService to announce the purpose of the view.
		-->
		<string name="description_star">favorite</string>

		<!-- Strings for car mode notification -->
		<!-- Shown when car mode is enabled -->
		<string name="car_mode_disable_notification_title">Car mode enabled</string>