Merge change 24893 into eclair
* changes:
More call log and favorites list UI changes.
diff --git a/res/layout-finger/display_header.xml b/res/layout-finger/display_header.xml
index 421d421..65f82aa 100644
--- a/res/layout-finger/display_header.xml
+++ b/res/layout-finger/display_header.xml
@@ -4,9 +4,9 @@
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.
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
@@ -53,7 +53,7 @@
</RelativeLayout>
- <RadioButton
+ <CheckBox
android:id="@android:id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 060f252..892569a 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -4,9 +4,9 @@
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.
@@ -18,7 +18,6 @@
<!-- The EditText for entries in the EditContactActivity -->
<item type="id" name="data" />
- <item type="id" name="header_all" />
<item type="id" name="header_phones" />
<item type="id" name="dialog_delete" />
diff --git a/src/com/android/contacts/ui/DisplayGroupsActivity.java b/src/com/android/contacts/ui/DisplayGroupsActivity.java
index dffbfda..c358609 100644
--- a/src/com/android/contacts/ui/DisplayGroupsActivity.java
+++ b/src/com/android/contacts/ui/DisplayGroupsActivity.java
@@ -16,12 +16,6 @@
package com.android.contacts.ui;
-import com.android.contacts.R;
-import com.android.contacts.model.ContactsSource;
-import com.android.contacts.model.Sources;
-import com.android.contacts.util.WeakAsyncTask;
-import com.google.android.collect.Sets;
-
import android.accounts.Account;
import android.app.Activity;
import android.app.AlertDialog;
@@ -55,10 +49,16 @@
import android.widget.CursorTreeAdapter;
import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView;
-import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
+import com.google.android.collect.Sets;
+
+import com.android.contacts.R;
+import com.android.contacts.model.ContactsSource;
+import com.android.contacts.model.Sources;
+import com.android.contacts.util.WeakAsyncTask;
+
import java.util.ArrayList;
import java.util.HashSet;
@@ -74,7 +74,7 @@
public interface Prefs {
public static final String DISPLAY_ONLY_PHONES = "only_phones";
- public static final boolean DISPLAY_ONLY_PHONES_DEFAULT = true;
+ public static final boolean DISPLAY_ONLY_PHONES_DEFAULT = false;
}
@@ -83,10 +83,8 @@
private SharedPreferences mPrefs;
- private RadioButton mDisplayAll;
- private RadioButton mDisplayPhones;
+ private CheckBox mDisplayPhones;
- private View mHeaderAll;
private View mHeaderPhones;
private View mHeaderSeparator;
@@ -100,23 +98,10 @@
final LayoutInflater inflater = getLayoutInflater();
- // Add the "All contacts" header modifier.
- mHeaderAll = inflater.inflate(R.layout.display_header, mList, false);
- mHeaderAll.setId(R.id.header_all);
- mDisplayAll = (RadioButton)mHeaderAll.findViewById(android.R.id.checkbox);
- {
- final TextView text1 = (TextView)mHeaderAll.findViewById(android.R.id.text1);
- final TextView text2 = (TextView)mHeaderAll.findViewById(android.R.id.text2);
- text1.setText(R.string.showAllGroups);
- text2.setVisibility(View.GONE);
- }
- mList.addHeaderView(mHeaderAll, null, true);
-
-
// Add the "Only contacts with phones" header modifier.
mHeaderPhones = inflater.inflate(R.layout.display_header, mList, false);
mHeaderPhones.setId(R.id.header_phones);
- mDisplayPhones = (RadioButton)mHeaderPhones.findViewById(android.R.id.checkbox);
+ mDisplayPhones = (CheckBox) mHeaderPhones.findViewById(android.R.id.checkbox);
{
final TextView text1 = (TextView)mHeaderPhones.findViewById(android.R.id.text1);
final TextView text2 = (TextView)mHeaderPhones.findViewById(android.R.id.text2);
@@ -139,7 +124,6 @@
boolean displayOnlyPhones = mPrefs.getBoolean(Prefs.DISPLAY_ONLY_PHONES,
Prefs.DISPLAY_ONLY_PHONES_DEFAULT);
- mDisplayAll.setChecked(!displayOnlyPhones);
mDisplayPhones.setChecked(displayOnlyPhones);
mAdapter.setChildDescripWithPhones(displayOnlyPhones);
@@ -229,11 +213,6 @@
*/
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (view.getId()) {
- case R.id.header_all: {
- mDisplayAll.toggle();
- setDisplayOnlyPhones(!mDisplayAll.isChecked());
- break;
- }
case R.id.header_phones: {
mDisplayPhones.toggle();
setDisplayOnlyPhones(mDisplayPhones.isChecked());
@@ -247,7 +226,6 @@
* the visible list as needed.
*/
protected void setDisplayOnlyPhones(boolean displayOnlyPhones) {
- mDisplayAll.setChecked(!displayOnlyPhones);
mDisplayPhones.setChecked(displayOnlyPhones);
Editor editor = mPrefs.edit();