- Added setting for 'always back to all-threads'

ba0f3 · Aug 14, 2009 · 8bf617e · 8bf617e
1 parent f6f0a5b
commit 8bf617e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -666,5 +666,8 @@
     <string name="pref_title_custom_screen_timeout_dim">Auto dim screen</string>
     <string name="pref_summaryon_custom_screen_timeout_dim">Screen stays awake but may be dimmed to save battery power</string>
     <string name="pref_summaryoff_custom_screen_timeout_dim">Screen is on at full brightness</string>
+
+    <string name="pref_title_back_to_all_threads">Back to all threads</string>
+    <string name="pref_summary_back_to_all_threads">Always go to all-threads when Back button pressed</string>
 </resources>
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -158,5 +158,9 @@
                         android:defaultValue="true" />
         </PreferenceCategory>
     </PreferenceScreen>
+    <CheckBoxPreference android:key="pref_key_mms_back_to_all_threads"
+                        android:title="@string/pref_title_back_to_all_threads"
+                        android:summary="@string/pref_summary_back_to_all_threads"
+                        android:defaultValue="false" />
   </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -168,8 +168,8 @@ public class ComposeMessageActivity extends Activity
     public static final int REQUEST_CODE_CREATE_SLIDESHOW = 16;
 
     private static final String TAG = "ComposeMessageActivity";
-    private static final boolean DEBUG = false;
-    private static final boolean TRACE = false;
+    private static final boolean DEBUG = true;
+    private static final boolean TRACE = true;
     private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
 
     // Menu ID
@@ -256,6 +256,7 @@ public class ComposeMessageActivity extends Activity
     private int mSignatureAutoAppend;       // Setting for Signature auto-append
     private int mScreenTimeout;             // Number of seconds that screen stays awake for
     private WakeLock mScreenTimeoutWakeLock;// Custom screen timeout
+    private boolean mBackToAllThreads;      // Always ack to all-threads
 
 
     private View mTopPanel;                 // View containing the recipient and subject editors
@@ -1609,6 +1610,7 @@ protected void onCreate(Bundle savedInstanceState) {
             mScreenTimeoutWakeLock = pm.newWakeLock(dimscreen ? PowerManager.SCREEN_DIM_WAKE_LOCK : PowerManager.SCREEN_BRIGHT_WAKE_LOCK, TAG);
             mScreenTimeoutWakeLock.setReferenceCounted(false);
         }
+        mBackToAllThreads = prefs.getBoolean(MessagingPreferenceActivity.BACK_TO_ALL_THREADS, false);
 
         setProgressBarVisibility(false);
 
@@ -1925,6 +1927,11 @@ public void run() {
                         finish();
                     }
                 });
+                // always return all threads
+                if(mBackToAllThreads) {
+                    goToConversationList();
+                }
+
                 return true;
         }
 

diff --git a/src/com/android/mms/ui/MessagingPreferenceActivity.java b/src/com/android/mms/ui/MessagingPreferenceActivity.java
@@ -74,6 +74,7 @@ public class MessagingPreferenceActivity extends PreferenceActivity {
     public static final String USER_AGENT_CUSTOM            = "pref_key_mms_user_agent_custom";
     public static final String CUSTOM_SCREEN_TIMEOUT        = "pref_key_mms_custom_screen_timeout";
     public static final String CUSTOM_SCREEN_TIMEOUT_DIM    = "pref_key_mms_custom_screen_timeout_dim";
+    public static final String BACK_TO_ALL_THREADS          = "pref_key_mms_back_to_all_threads";
 
     // Menu entries
     private static final int MENU_RESTORE_DEFAULTS    = 1;