Added more stuff to preferences :). Also tweaked the layout for contacts a little. (290da69e) · Commits · e / os / android_packages_apps_Contacts

res/layout-finger/contacts_list_item.xml

+12 −11

Original line number	Diff line number	Diff line
		@@ -21,16 +21,15 @@
		android:layout_width="fill_parent"
		android:layout_height="?android:attr/listPreferredItemHeight"
		android:paddingLeft="7dip"
		android:paddingRight="5dip"
		>

		<com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/call_icon"
		<com.android.contacts.ui.widget.DontPressWithParentImageView
		android:id="@+id/call_icon"
		android:layout_width="wrap_content"
		android:layout_height="fill_parent"
		android:paddingLeft="14dip"
		android:paddingRight="14dip"
		android:layout_alignParentRight="true"

		android:gravity="center_vertical"
		android:src="@android:drawable/sym_action_call"
		android:background="@drawable/call_background"
		@@ -42,19 +41,20 @@
		android:layout_marginTop="5dip"
		android:layout_marginBottom="5dip"
		android:layout_toLeftOf="@id/call_icon"
		android:layout_marginLeft="11dip"
		android:layout_marginLeft="6dip"
		android:background="@drawable/divider_vertical_dark"
		/>

		<ImageView android:id="@+id/presence"
		android:layout_width="32dip"
		android:layout_height="32dip"
		android:layout_alignParentRight="true"
		android:layout_marginLeft="5dip"
		android:layout_toLeftOf="@id/divider"
		android:layout_marginLeft="1dip"
		android:layout_marginRight="5dip"
		android:layout_centerVertical="true"

		android:gravity="center"
		android:scaleType="centerInside"
		android:layout_alignWithParentIfMissing="true"
		/>

		<TextView android:id="@+id/label"
		@@ -63,9 +63,10 @@
		android:layout_alignParentLeft="true"
		android:layout_alignParentBottom="true"
		android:layout_marginBottom="8dip"
		android:layout_marginTop="-8dip"
		android:layout_marginTop="-10dip"

		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textStyle="bold"
		/>
		@@ -85,8 +86,8 @@
		/>

		<TextView android:id="@+id/name"
		android:layout_width="0dip"
		android:layout_height="0dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_above="@id/label"
		android:layout_alignWithParentIfMissing="true"
		android:layout_alignParentTop="true"

res/layout-finger/contacts_list_item_photo.xml

+3 −4

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@
		android:paddingLeft="14dip"
		android:paddingRight="14dip"
		android:layout_alignParentRight="true"

		android:gravity="center_vertical"
		android:src="@android:drawable/sym_action_call"
		android:background="@drawable/call_background"
		@@ -42,7 +41,7 @@
		android:layout_marginTop="5dip"
		android:layout_marginBottom="5dip"
		android:layout_toLeftOf="@id/call_icon"
		android:layout_marginLeft="11dip"
		android:layout_marginLeft="6dip"
		android:background="@drawable/divider_vertical_dark"
		/>

		@@ -51,7 +50,7 @@
		android:layout_height="32dip"
		android:layout_toLeftOf="@id/divider"
		android:layout_marginLeft="1dip"
		android:layout_marginRight="1dip"
		android:layout_marginRight="5dip"
		android:layout_centerVertical="true"
		android:gravity="center"
		android:scaleType="centerInside"
		@@ -64,7 +63,6 @@
		android:layout_alignParentLeft="true"
		android:layout_centerVertical="true"
		android:layout_marginRight="8dip"

		android:gravity="center"
		android:scaleType="fitCenter"
		android:background="@drawable/contact_picture_border_in_list"
		@@ -106,6 +104,7 @@
		android:layout_alignParentTop="true"
		android:layout_above="@id/label"
		android:layout_alignWithParentIfMissing="true"
		android:layout_marginBottom="1dip"

		android:singleLine="true"
		android:ellipsize="marquee"

res/values/strings.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -763,6 +763,8 @@
		<string name="title_cl_relative_time">Relative times</string>
		<string name="summaryon_cl_relative_time">Use relative times in call log</string>
		<string name="summaryoff_cl_relative_time">Use exact times in call log</string>
		<string name="title_cl_show_seconds">Show seconds</string>
		<string name="summary_cl_show_seconds">Show seconds when using exact times</string>
		<string name="title_cl_ask_before_clear">Ask before clearing</string>
		<string name="summaryon_cl_ask_before_clear">Ask before clearing call log</string>
		<string name="summaryoff_cl_ask_before_clear">Call logs will be cleared without asking</string>

res/xml/contacts_preferences.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,13 @@
		android:title="@string/title_cl_relative_time"
		android:summaryOn="@string/summaryon_cl_relative_time"
		android:summaryOff="@string/summaryoff_cl_relative_time"
		android:disableDependentsState="true"
		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="cl_show_seconds"
		android:title="@string/title_cl_show_seconds"
		android:summary="@string/summary_cl_show_seconds"
		android:dependency="cl_relative_time"
		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="cl_ask_before_clear"

src/com/android/contacts/RecentCallsListActivity.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -526,11 +526,20 @@ public class RecentCallsListActivity extends ListActivity
		views.dateView.setText(DateUtils.getRelativeTimeSpanString(date,
		System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS, flags));
		} else {
		String format = null;
		if (DateFormat.is24HourFormat(context)) {
		views.dateView.setText(DateFormat.format("MMM dd, kk:mm", date));
		if (prefs.getBoolean("cl_show_seconds", true))
		format = "MMM dd, kk:mm:ss";
		else
		format = "MMM dd, kk:mm";
		} else {
		views.dateView.setText(DateFormat.format("MMM dd, h:mmaa", date));
		if (prefs.getBoolean("cl_show_seconds", true))
		format = "MMM dd, h:mm:ss aa";
		else
		format = "MMM dd, h:mm aa";
		}

		views.dateView.setText(DateFormat.format(format, date));
		}

		// Set the icon

src/com/android/contacts/ContactsPreferences.java

+3 −3

File changed.

Contains only whitespace changes.