commit b8a1bc628d8ab6c48571e1e23dcb26ced7096adf
author Baligh Uddin <baligh@google.com> Wed Sep 19 15:05:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 19 15:05:48 2012 -0700
tree 1e186053e8447b1a265c36549b01248f5be2f57f
parent 80b16d93ff0d8e07b48b29b60261711089e77d98
parent 584aeaeab7da41769defe9eb4ef8be72a807441f

Merge "Import translations. DO NOT MERGE"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0b38708..ca66efe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -138,16 +138,16 @@
     <string name="call_log_old_header">Older</string>
 
     <!-- The header to show that call log is only showing voicemail calls. [CHAR LIMIT=40] -->
-    <string name="call_log_voicemail_header">Calls with voicemail</string>
+    <string name="call_log_voicemail_header">Calls with voicemail only</string>
 
     <!-- The header to show that call log is only showing incoming calls. [CHAR LIMIT=40] -->
-    <string name="call_log_incoming_header">Incoming calls</string>
+    <string name="call_log_incoming_header">Incoming calls only</string>
 
     <!-- The header to show that call log is only showing outgoing calls. [CHAR LIMIT=40] -->
-    <string name="call_log_outgoing_header">Outgoing calls</string>
+    <string name="call_log_outgoing_header">Outgoing calls only</string>
 
     <!-- The header to show that call log is only showing missed calls. [CHAR LIMIT=40] -->
-    <string name="call_log_missed_header">Missed calls</string>
+    <string name="call_log_missed_header">Missed calls only</string>
 
     <!--  Voicemail status message shown at the top of call log to notify the user that no new
     voicemails are currently available. This can happen when both notification as well as data

src/com/android/dialer/calllog/CallLogFragment.java

diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 1aa96fd..faf2b52 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -21,7 +21,6 @@
 import android.app.ListFragment;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
@@ -29,7 +28,6 @@
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.preference.PreferenceManager;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract;
@@ -71,8 +69,6 @@
      */
     private static final int EMPTY_LOADER_ID = 0;
 
-    private static final String PREF_CALL_LOG_FILTER_LAST_CALL_TYPE = "CallLogFragment_last_filter";
-
     private CallLogAdapter mAdapter;
     private CallLogQueryHandler mCallLogQueryHandler;
     private boolean mScrollToTop;
@@ -128,11 +124,6 @@
         getActivity().getContentResolver().registerContentObserver(
                 ContactsContract.Contacts.CONTENT_URI, true, mContactsObserver);
         setHasOptionsMenu(true);
-
-        // Load the last filter used.
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        mCallTypeFilter = prefs.getInt(PREF_CALL_LOG_FILTER_LAST_CALL_TYPE,
-                CallLogQueryHandler.CALL_TYPE_ALL);
     }
 
     /** Called by the CallLogQueryHandler when the list of calls has been fetched or updated. */
@@ -297,11 +288,6 @@
         super.onPause();
         // Kill the requests thread
         mAdapter.stopRequestProcessing();
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        prefs.edit()
-                .putInt(PREF_CALL_LOG_FILTER_LAST_CALL_TYPE, mCallTypeFilter)
-                .apply();
     }
 
     @Override