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

res/layout-finger/call_detail.xml

+6 −2

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@
		android:text="@string/unknown"
		/>

		<!--
		<TextView android:id="@+id/number"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -67,6 +68,7 @@
		android:textColor="?android:attr/textColorPrimaryInverse"
		android:text="@string/unknown"
		/>
		-->
		</LinearLayout>
		</LinearLayout>

		@@ -88,6 +90,7 @@
		android:scrollbarStyle="outsideOverlay"
		/>

		<!--
		<ScrollView android:id="@android:id/empty"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		@@ -106,6 +109,7 @@
		android:lineSpacingMultiplier="0.92"/>

		</ScrollView>
		-->

		</FrameLayout>

res/layout-finger/call_detail_list_item.xml

+121 −33

Original line number	Diff line number	Diff line
		@@ -42,18 +42,7 @@
		android:gravity="center_vertical"
		/>

		<TextView android:id="@+id/call"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="11dip"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:text="@string/callBack"
		android:layout_alignParentLeft="true"
		android:layout_marginTop="17dip"
		android:gravity="center_vertical"
		/>

		<View android:id="@+id/divider1"
		<com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/divider1"
		android:layout_width="1px"
		android:layout_height="fill_parent"
		android:layout_marginBottom="5dip"
		@@ -73,6 +62,88 @@
		android:background="@drawable/call_background"
		/>

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

		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textStyle="bold"
		/>

		<TextView android:id="@+id/most_recent_num"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="5dip"
		android:layout_toRightOf="@id/most_recent_num_label"
		android:layout_alignBaseline="@id/most_recent_num_label"
		android:layout_toLeftOf="@id/call_icon"
		android:layout_alignWithParentIfMissing="true"

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

		<TextView android:id="@+id/call"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_above="@id/most_recent_num_label"
		android:layout_alignWithParentIfMissing="true"
		android:layout_alignParentTop="true"
		android:layout_alignParentLeft="true"
		android:layout_marginBottom="1dip"

		android:singleLine="true"
		android:ellipsize="marquee"
		android:gravity="center_vertical\|left"
		android:textAppearance="?android:attr/textAppearanceLarge"
		/>

		<!--
		<TextView android:id="@+id/call"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="11dip"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:text="@string/callBack"
		android:layout_alignParentLeft="true"
		android:layout_alignParentTop="true"
		android:layout_marginTop="17dip"
		android:gravity="center_vertical"
		/>

		<TextView android:id="@+id/most_recent_num_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="11dip"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:text="@string/title_contacts_category"
		android:layout_below="@id/call"
		android:layout_alignLeft="@id/call"
		android:textStyle="bold"
		/>

		<TextView android:id="@+id/most_recent_num"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="5dip"
		android:layout_toRightOf="@id/most_recent_num_label"
		android:layout_below="@id/call"
		android:layout_alignBaseline="@id/most_recent_num_label"
		android:layout_alignWithParentIfMissing="true"

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

		</RelativeLayout>

		<LinearLayout android:id="@+id/line_log"
		@@ -80,17 +151,16 @@
		android:layout_height="?android:attr/listPreferredItemHeight"
		android:orientation="horizontal"
		android:gravity="center_vertical"
		android:background="@android:drawable/list_selector_background"
		android:paddingLeft="5dip"
		>

		<ImageView android:id="@+id/icon"
		<com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="4dip"
		android:paddingRight="4dip"
		android:layout_height="fill_parent"
		android:paddingLeft="7dip"
		android:paddingRight="5dip"
		android:gravity="center"
		android:scaleType="centerInside"
		android:background="@drawable/call_background"
		/>

		<RelativeLayout
		@@ -98,25 +168,15 @@
		android:layout_height="fill_parent"
		android:paddingTop="5dip"
		>

		<TextView android:id="@+id/type"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="11dip"
		android:layout_alignParentLeft="true"
		android:layout_alignParentTop="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textStyle="bold"
		android:text="@string/menu_sendTextMessage"
		/>

		<TextView android:id="@+id/duration"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="11dip"
		android:layout_marginLeft="5dip"
		android:layout_alignParentRight="true"
		android:layout_alignBaseline="@id/type"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:singleLine="true"
		android:ellipsize="marquee"
		/>

		<TextView android:id="@+id/time"
		@@ -127,8 +187,36 @@
		android:singleLine="true"
		android:layout_marginBottom="8dip"
		android:layout_marginTop="-8dip"
		android:layout_marginLeft="11dip"
		android:layout_marginLeft="5dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		/>

		<TextView android:id="@+id/label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="5dip"
		android:layout_alignParentLeft="true"
		android:layout_alignParentTop="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:gravity="center_vertical"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textStyle="bold"
		/>

		<TextView android:id="@+id/type"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="5dip"
		android:layout_alignParentTop="true"
		android:layout_toRightOf="@id/label"
		android:layout_toLeftOf="@id/duration"
		android:layout_alignBaseline="@id/label"
		android:layout_alignWithParentIfMissing="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:gravity="center_vertical"
		android:singleLine="true"
		android:ellipsize="marquee"
		/>

		</RelativeLayout>

res/layout-finger/recent_calls_list_item.xml

+17 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@
		android:layout_toLeftOf="@id/divider"
		android:layout_alignWithParentIfMissing="true"
		android:layout_marginRight="9dip"
		android:layout_marginLeft="3dip"
		/>

		<!-- Wysie_Soh: Default values
		@@ -107,12 +108,27 @@
		android:textAppearance="?android:attr/textAppearanceSmall"
		/>

		<TextView android:id="@+id/count"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toLeftOf="@id/call_type_icon"
		android:layout_above="@id/date"
		android:layout_alignBaseline="@id/call_type_icon"
		android:layout_marginLeft="5dip"
		android:layout_alignParentTop="true"
		android:layout_alignWithParentIfMissing="true"

		android:textAppearance="?android:attr/textAppearanceMedium"
		android:singleLine="true"
		android:gravity="center_vertical"
		/>

		<TextView android:id="@+id/line1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_toRightOf="@id/photo"
		android:layout_toLeftOf="@+id/call_type_icon"
		android:layout_toLeftOf="@id/count"
		android:layout_above="@id/label"
		android:layout_alignWithParentIfMissing="true"

res/values/arrays.xml

+7 −5

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		<item>2</item>
		<item>3</item>
		<item>4</item>
		<item>5</item>
		</string-array>

		<string-array name="digits_colors">
		@@ -66,11 +67,12 @@
		</string-array>

		<string-array name="vm_handlers">
		<item>T-mobile Visual Voicemail/com.oz.mobile.android.voicemail.application/.application</item>
		<item>Google Voice/com.google.android.apps.googlevoice/.SplashActivity</item>
		<item>YouMail/com.loadedbanana.android.youmail/.activity.MessageList</item>
		<item>HulloMail/com.hullomail.android.messaging.us/.HulloMail</item>
		<item>PF Voicemail/com.phonefusion.voicemailplus.android/.VoicemailPlus</item>
		<item>HulloMail UK Visual Voicemail/com.hullomail.android.messaging/.HulloMail</item>
		<item>HulloMail US Visual Voicemail/com.hullomail.android.messaging.us/.HulloMail</item>
		<item>PhoneFusion Visual Voicemail/com.phonefusion.voicemailplus.android/.VoicemailPlus</item>
		<item>T-Mobile Visual Voicemail/com.oz.mobile.android.voicemail.application/.application</item>
		<item>YouMail Visual Voicemail/com.loadedbanana.android.youmail/.activity.MessageList</item>
		</string-array>

		<string-array name="view_contact_pic_sizes">

res/values/strings.xml

+31 −6

Original line number	Diff line number	Diff line
		@@ -797,8 +797,18 @@
		<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>
		<string name="title_cl_always_clear_cache">Always clear number cache</string>
		<string name="summaryon_cl_always_clear_cache">Ensures call log is always up to date</string>
		<string name="summaryoff_cl_always_clear_cache">Faster return to call log but info may be outdated if contact info has changed</string>

		<string name="title_view_cl">Individual call log</string>
		<string name="summary_view_cl">Set preferences when viewing an individual's call log</string>
		<string name="summary_view_cl">Set preferences when viewing an individual\'s call log</string>

		<string name="title_cl_grouping_settings">Group call log settings</string>
		<string name="title_cl_use_exp_grouping">Group unknown numbers (Experimental)</string>
		<string name="summary_cl_use_exp_grouping">Attempts to group unsaved numbers together. Affects clearing of logs as well.</string>
		<string name="title_cl_exp_grouping_num">Number of digits to compare</string>
		<string name="summary_cl_exp_grouping_num">Higher number = stricter</string>

		<string name="title_contacts_category">Contacts</string>
		<string name="title_contacts_show_pic">Show contact pictures</string>
		@@ -844,13 +854,23 @@
		<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">2.5</string>
		<string name="summary_about_version">2.61</string>
		<string name="title_about_credits">Credits</string>
		<string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>
		<string name="summary_about_credits">ChainsDD, geesun and the rest of XDA! :)</string>

		<!-- Wysie_Soh: Call log strings -->
		<string name="alert_clear_call_log_title">Clear call log</string>
		<string name="alert_clear_call_log_message">Are you sure you want to clear all call records?</string>
		<string name="menu_cl_clear_type">Remove all %s</string>

		<string name="alert_clear_cl_person">Are you sure you want to clear all call records of %s?</string>
		<string name="alert_clear_cl_person_incoming">Are you sure you want to clear all incoming call records from %s?</string>
		<string name="alert_clear_cl_person_outgoing">Are you sure you want to clear all outgoing call records to %s?</string>
		<string name="alert_clear_cl_person_missed">Are you sure you want to clear all missed call records from %s?</string>

		<string name="alert_clear_cl_all_incoming">Are you sure you want to clear all incoming call records?</string>
		<string name="alert_clear_cl_all_outgoing">Are you sure you want to clear all outgoing call records?</string>
		<string name="alert_clear_cl_all_missed">Are you sure you want to clear all missed call records?</string>

		<!-- Wysie_Soh: Frequently called strings -->
		<string name="alert_clear_freq_called">Clear frequently called</string>
		@@ -859,9 +879,8 @@
		<!-- Wysie_Soh: View contact strings -->
		<string name="view_contact_navigate">Navigate to</string>
		<string name="view_contact_groups">Groups</string>
		<string name="recentCalls_removeAllFrom">Remove all </string>

		<string name="view_contact_groups">Groups</string>
		<string name="view_call_log">View call log</string>
		<string name="view_contact_select_cl_number">Select number to view log</string>

		<!-- Wysie_Soh: Groups management -->
		<string name="help_title">Usage</string>
		@@ -877,4 +896,10 @@
		<string name="alert_rename_group_message">Enter new group name</string>
		<string name="alert_delete_group_message">Are you sure you want to delete?</string>

		<!-- Wysie_Soh: Others -->
		<!-- Toast for call detail screen when couldn't read the requested details -->
		<string name="toast_call_detail_error_wysie">No such contact or no call log found for the requested number</string>
		<string name="menu_copy_string">Copy \"%s\"</string>
		<string name="cl_total_cl">Total Duration</string>

		</resources>