Merge "Remove some debug code from MessageListXL."

3 files changed, 0 insertions, 24 deletions

diff --git a/res/menu/message_list_xl_option.xml b/res/menu/message_list_xl_option.xml
index d1698e8ac..9f2e95fc5 100644
--- a/res/menu/message_list_xl_option.xml
+++ b/res/menu/message_list_xl_option.xml
@@ -31,7 +31,4 @@
         android:title="@string/account_settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
-    <item android:id="@+id/change_orientation"
-        android:title="@string/menu_change_orientation"
-    />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 58e938977..0c6f3411a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -770,7 +770,4 @@
     <string name="title_fix_all_bugs_preference" translatable="false">Fix All Bugs</string>
     <!-- STOPSHIP remove this fake preference -->
     <string name="summary_fix_all_bugs_preference" translatable="false">Cheaper than beer</string>
-
-    <!-- Do Not Translate.  STOPSHIP: Dev version only.  Remove this. -->
-    <string name="menu_change_orientation" translatable="false">Change orientation</string>
 </resources>
diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java
index effd622b9..6e0003350 100644
--- a/src/com/android/email/activity/MessageListXL.java
+++ b/src/com/android/email/activity/MessageListXL.java
@@ -591,11 +591,6 @@ public class MessageListXL extends Activity implements View.OnClickListener,
                 return true;
             case R.id.account_settings:
                 return onAccountSettings();
-            case R.id.change_orientation: // STOPSHIP remove this
-                Utility.changeOrientation(this);
-                return true;
-            case R.id.add_new_account: // STOPSHIP remove this
-                return onAddNewAccount();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -729,19 +724,6 @@ public class MessageListXL extends Activity implements View.OnClickListener,
         }
     }
 
-    /**
-     * STOPSHIP: Remove this.
-     * Rotate screen when the R key is pressed.  Workaround for auto-orientation not working.
-     */
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_R) {
-            Utility.changeOrientation(this);
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
     // TODO It's a temporary implementation.  See {@link MoveMessagetoDialog}
     @Override
     public void onMoveToMailboxSelected(long newMailboxId, long[] messageIds) {