Merge "Add keyboard layout name constant"

tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java

@@ -24,6 +24,8 @@ import com.android.inputmethod.keyboard.layout.expected.LayoutBase;
  * The QWERTY alphabet keyboard.
  */
 public final class Qwerty extends LayoutBase {
+    public static final String LAYOUT_NAME = "qwerty";
+
     public static ExpectedKey[][] getLayout(final boolean isPhone) {
         return getDefaultAlphabetLayout(ALPHABET_COMMON, isPhone);
     }

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java

@@ -36,7 +36,7 @@ public final class TestsEnglishUS extends LayoutTestsBase {
 
     @Override
     String getTestKeyboardLayout() {
-        return "qwerty";
+        return Qwerty.LAYOUT_NAME;
     }
 
     @Override