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

AndroidManifest.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		<uses-permission android:name="android.permission.BLUETOOTH" />
		<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
		<uses-permission android:name="android.permission.CALL_PRIVILEGED" />
		<uses-permission android:name="android.permission.CAMERA" />
		<uses-permission android:name="android.permission.READ_CONTACTS" />
		<uses-permission android:name="android.permission.WRITE_CONTACTS" />
		<uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
		@@ -390,6 +391,9 @@
		</intent-filter>
		</activity>

		<activity android:name="GroupsListActivity">
		</activity>

		</application>
		</manifest>

AndroidManifest.xml~

+6 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,10 @@
		<uses-permission android:name="android.permission.BLUETOOTH" />
		<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
		<uses-permission android:name="android.permission.CALL_PRIVILEGED" />
		<uses-permission android:name="android.permission.CAMERA" />
		<uses-permission android:name="android.permission.READ_CONTACTS" />
		<uses-permission android:name="android.permission.WRITE_CONTACTS" />
		<uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
		<uses-permission android:name="android.permission.INTERNET" />
		<uses-permission android:name="android.permission.READ_PHONE_STATE" />
		<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
		@@ -382,6 +384,9 @@
		</intent-filter>
		</activity>

		<activity android:name="GroupsListActivity">
		</activity>

		</application>
		</manifest>

res/layout-finger/groups_list_content.xml

0 → 100755

+17 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:orientation="vertical">

		<ListView
		android:id="@+id/android:list"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:fastScrollEnabled="true"/>
		<TextView
		android:id="@id/android:empty"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"/>

		</LinearLayout>

res/layout-finger/groups_list_item.xml

0 → 100755

+19 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="fill_parent"
		android:layout_height="?android:attr/listPreferredItemHeight"
		android:paddingLeft="7dip">

		<TextView
		android:id="@+id/text1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:gravity="center_vertical\|left"
		android:layout_alignParentLeft="true"
		android:layout_centerVertical="true"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLarge"/>

		</RelativeLayout>

res/values/strings.xml

+28 −3

Original line number	Diff line number	Diff line
		@@ -379,6 +379,10 @@
		<!-- Menu item used to remove all calls from the call log -->
		<string name="recentCalls_deleteAll">Clear call log</string>

		<string name="recentCalls_deleteAllIncoming">Clear incoming</string>
		<string name="recentCalls_deleteAllOutgoing">Clear outgoing</string>
		<string name="recentCalls_deleteAllMissed">Clear missed</string>

		<!-- Text displayed when the call log is empty -->
		<string name="recentCalls_empty">Call log is empty.</string>

		@@ -746,12 +750,13 @@

		<!-- Wysie_Soh: Contacts menu (across all 4, ie. Dialer, Contacts, Call log, Favourites -->
		<string name="menu_preferences">Preferences</string>
		<string name="contacts_manage_groups">Manage groups</string>

		<!-- Wysie_Soh: Dialer menu -->
		<string name="dialer_menu_sms">SMS/MMS</string>

		<!-- Wysie_Soh: Call log menu -->
		<string name="call_log_menu_total_duration">Total Incoming/Outgoing</string>
		<string name="call_log_menu_total_duration">Total incoming/outgoing</string>

		<!-- Wysie_Soh: Total incoming/outgoing dialog -->
		<string name="totalcalllog">Total incoming/outgoing duration</string>
		@@ -760,7 +765,7 @@
		<string name="total_button_ok">Ok</string>

		<!-- Favourites menu -->
		<string name="fav_clear_freq">Clear Frequently Called</string>
		<string name="fav_clear_freq">Clear frequently called</string>

		<!-- Wysie_Soh: Preferences strings (based on ChainsDD's code) -->
		<string name="title_dialer_category">Dialer</string>
		@@ -804,6 +809,11 @@
		<string name="summaryon_contacts_show_separators">Alphabetical separators will be shown in the contacts list</string>
		<string name="summaryoff_contacts_show_separators">Alphabetical separators will be hidden in the contacts list</string>

		<string name="groups_manager_title">Manage groups preferences</string>
		<string name="title_groups_ask_before_del">Ask before deleting</string>
		<string name="summaryon_groups_ask_before_del">Ask before deleting group</string>
		<string name="summaryoff_groups_ask_before_del">Groups will be deleted without asking</string>

		<string name="title_favourites_category">Favourites</string>
		<string name="title_favourites_hide_freq_call">Hide frequently called</string>
		<string name="summary_favourites_hide_freq_call">The actual data is not cleared, but hidden.</string>
		@@ -818,7 +828,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">2.11</string>
		<string name="summary_about_version">2.3</string>
		<string name="title_about_credits">Credits</string>
		<string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>

		@@ -836,4 +846,19 @@
		<string name="view_contact_groups">Groups</string>
		<string name="recentCalls_removeAllFrom">Remove all </string>


		<!-- Wysie_Soh: Groups management -->
		<string name="help_title">Usage</string>
		<string name="help_message">
		Long-press on group name to rename or delete it. Press menu to add group. This message will not be shown until the next update.
		</string>

		<string name="title_groups_manager">Manage groups</string>
		<string name="option_create_group">Create group</string>
		<string name="alert_create_group_message">Enter group name</string>
		<string name="context_rename_group">Rename group</string>
		<string name="context_delete_group">Delete group</string>
		<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>

		</resources>