Bug 1170884 - Use fully qualified android.R.*. r?nalexander
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 02 Jun 2015 18:21:38 -0700
changeset 247070 37f093517fc024487a3d9f67346db4cf15356ad8
parent 247069 6657b144de7c648e7023078fbbbf7105b0da0985
child 247071 4b69a62d1905679020c20fc3f06645140532eb3e
push id13343
push usermichael.l.comella@gmail.com
push dateThu, 04 Jun 2015 04:35:03 +0000
treeherderfx-team@37f093517fc0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1170884
milestone41.0a1
Bug 1170884 - Use fully qualified android.R.*. r?nalexander
mobile/android/base/GeckoInputConnection.java
--- a/mobile/android/base/GeckoInputConnection.java
+++ b/mobile/android/base/GeckoInputConnection.java
@@ -12,17 +12,16 @@ import java.util.concurrent.SynchronousQ
 
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.gfx.InputConnectionHandler;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.ThreadUtils.AssertBehavior;
 
-import android.R;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.SpannableString;
@@ -286,37 +285,37 @@ class GeckoInputConnection
         Editable editable = getEditable();
         if (editable == null) {
             return false;
         }
         int selStart = Selection.getSelectionStart(editable);
         int selEnd = Selection.getSelectionEnd(editable);
 
         switch (id) {
-            case R.id.selectAll:
+            case android.R.id.selectAll:
                 setSelection(0, editable.length());
                 break;
-            case R.id.cut:
+            case android.R.id.cut:
                 // If selection is empty, we'll select everything
                 if (selStart == selEnd) {
                     // Fill the clipboard
                     Clipboard.setText(editable);
                     editable.clear();
                 } else {
                     Clipboard.setText(
                             editable.toString().substring(
                                 Math.min(selStart, selEnd),
                                 Math.max(selStart, selEnd)));
                     editable.delete(selStart, selEnd);
                 }
                 break;
-            case R.id.paste:
+            case android.R.id.paste:
                 commitText(Clipboard.getText(), 1);
                 break;
-            case R.id.copy:
+            case android.R.id.copy:
                 // Copy the current selection or the empty string if nothing is selected.
                 String copiedText = selStart == selEnd ? "" :
                                     editable.toString().substring(
                                         Math.min(selStart, selEnd),
                                         Math.max(selStart, selEnd));
                 Clipboard.setText(copiedText);
                 break;
         }