Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into donut (38d9f019) · Commits · e / os / android_packages_apps_Contacts

res/layout-finger/contacts_list_item.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		android:layout_marginTop="5dip"
		android:layout_marginBottom="5dip"
		android:layout_toLeftOf="@id/call_icon"
		android:layout_marginLeft="6dip"
		android:layout_marginLeft="2dip"
		android:background="@drawable/divider_vertical_dark"
		/>

		@@ -50,7 +50,7 @@
		android:layout_height="32dip"
		android:layout_toLeftOf="@id/divider"
		android:layout_marginLeft="1dip"
		android:layout_marginRight="5dip"
		android:layout_marginRight="9dip"
		android:layout_centerVertical="true"
		android:gravity="center"
		android:scaleType="centerInside"

res/layout-finger/contacts_list_item_photo.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		android:layout_marginTop="5dip"
		android:layout_marginBottom="5dip"
		android:layout_toLeftOf="@id/call_icon"
		android:layout_marginLeft="6dip"
		android:layout_marginLeft="2dip"
		android:background="@drawable/divider_vertical_dark"
		/>

		@@ -50,7 +50,7 @@
		android:layout_height="32dip"
		android:layout_toLeftOf="@id/divider"
		android:layout_marginLeft="1dip"
		android:layout_marginRight="5dip"
		android:layout_marginRight="9dip"
		android:layout_centerVertical="true"
		android:gravity="center"
		android:scaleType="centerInside"
		@@ -75,6 +75,7 @@
		android:layout_alignParentBottom="true"
		android:layout_marginBottom="8dip"
		android:layout_marginTop="-10dip"
		android:layout_alignWithParentIfMissing="true"

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

res/layout-finger/recent_calls_list_item.xml

+25 −6

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@
		android:layout_marginTop="5dip"
		android:layout_marginBottom="5dip"
		android:layout_toLeftOf="@id/call_icon"
		android:layout_marginLeft="11dip"
		android:layout_marginLeft="2dip"
		android:background="@drawable/divider_vertical_dark"
		/>

		@@ -47,26 +47,45 @@
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_toLeftOf="@id/divider"
		android:layout_alignWithParentIfMissing="true"
		android:layout_marginRight="9dip"
		/>

		<!-- Wysie_Soh: Default values
		android:layout_marginBottom="4dip"
		-->
		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toLeftOf="@id/divider"
		android:layout_alignParentBottom="true"
		android:layout_marginBottom="8dip"
		android:layout_marginBottom="4dip"
		android:layout_alignWithParentIfMissing="true"
		android:layout_marginRight="5dip"

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

		<ImageView android:id="@+id/photo"
		android:layout_width="54dip"
		android:layout_height="54dip"
		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"
		/>

		<TextView android:id="@+id/label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentLeft="true"
		android:layout_toRightOf="@id/photo"
		android:layout_alignParentBottom="true"
		android:layout_marginBottom="8dip"
		android:layout_marginTop="-10dip"
		android:layout_alignWithParentIfMissing="true"

		android:singleLine="true"
		android:ellipsize="marquee"
		@@ -91,8 +110,8 @@
		<TextView android:id="@+id/line1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentLeft="true"
		android:layout_alignParentTop="true"
		android:layout_toRightOf="@id/photo"
		android:layout_toLeftOf="@+id/call_type_icon"
		android:layout_above="@id/label"
		android:layout_alignWithParentIfMissing="true"

res/values/strings.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -769,6 +769,10 @@
		<string name="title_disable_num_check">Disable number checks</string>
		<string name="summaryon_disable_num_check">Left action button (LAB) and menu will always be enabled</string>
		<string name="summaryoff_disable_num_check">LAB and menu will be enabled only if at least one number is entered (except voicemail)</string>
		<string name="title_use_1_for_reg_vm">Use 1 for regular voicemail</string>
		<string name="summaryon_use_1_for_reg_vm">Key 1 will be used for regular voicemail</string>
		<string name="summaryoff_use_1_for_reg_vm">Key 1 will follow voicemail handler</string>

		<string name="title_digits_color_unselected">Digits color (not selected)</string>
		<string name="title_digits_color_focused">Digits color (focused)</string>
		<string name="title_digits_color_pressed">Digits color (pressed)</string>
		@@ -790,7 +794,6 @@

		<string name="title_contacts_category">Contacts</string>
		<string name="title_contacts_show_pic">Show contact pictures</string>
		<string name="summary_contacts_show_pic">Affects Favs as well. Restart Contacts/Dialer to see changes</string>
		<string name="title_contacts_show_dial_button">Show dial button</string>
		<string name="summary_contacts_show_dial_button">Show a dial button for contacts with numbers</string>
		<string name="title_contacts_view_pic_size">View contact picture size</string>
		@@ -811,7 +814,7 @@
		<string name="title_about_name">Mod Name</string>
		<string name="summary_about_name">Wysie Contacts</string>
		<string name="title_about_version">Version</string>
		<string name="summary_about_version">1.94</string>
		<string name="summary_about_version">1.96</string>
		<string name="title_about_credits">Credits</string>
		<string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>

res/xml/contacts_preferences.xml

+25 −4

Original line number	Diff line number	Diff line
		@@ -32,6 +32,12 @@
		android:entries="@array/entries_vm_handler"
		android:entryValues="@array/entryvalues_numbers"
		android:defaultValue="0" />
		<CheckBoxPreference
		android:key="vm_use_1_for_regular_vm"
		android:title="@string/title_use_1_for_reg_vm"
		android:summaryOn="@string/summaryon_use_1_for_reg_vm"
		android:summaryOff="@string/summaryoff_use_1_for_reg_vm"
		android:defaultValue="false" />
		<CheckBoxPreference
		android:key="dial_disable_num_check"
		android:title="@string/title_disable_num_check"
		@@ -83,6 +89,14 @@
		</PreferenceScreen>
		</PreferenceCategory>
		<PreferenceCategory android:title="@string/recentCallsIconLabel">
		<CheckBoxPreference
		android:key="cl_show_dial_button"
		android:title="@string/title_contacts_show_dial_button"
		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="cl_show_pic"
		android:title="@string/title_contacts_show_pic"
		android:defaultValue="false" />
		<CheckBoxPreference
		android:key="cl_relative_time"
		android:title="@string/title_cl_relative_time"
		@@ -112,7 +126,6 @@
		<CheckBoxPreference
		android:key="contacts_show_pic"
		android:title="@string/title_contacts_show_pic"
		android:summary="@string/summary_contacts_show_pic"
		android:defaultValue="true" />
		<ListPreference
		android:key="contacts_view_contact_pic_size"
		@@ -124,6 +137,14 @@
		android:defaultValue="78" />
		</PreferenceCategory>
		<PreferenceCategory android:title="@string/contactsFavoritesLabel">
		<CheckBoxPreference
		android:key="favs_show_dial_button"
		android:title="@string/title_contacts_show_dial_button"
		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="favs_show_pic"
		android:title="@string/title_contacts_show_pic"
		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="favourites_hide_freq_called"
		android:title="@string/title_favourites_hide_freq_call"