Try hack to improve pre-launch testing.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index df9ab93be23fbae0c9b8f8d29f13ca234c30514c..6d76954eb3dc0e6c622746ff737b902c7bbfdf16 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -32,6 +32,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
@@ -324,6 +325,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
         setMyListAdapater();
         registerForContextMenu(getListView());
+        getListView().setItemsCanFocus(true);
 
         readableCheckAndError(true);
 
@@ -448,6 +450,10 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
+        if ("true".equals(Settings.System.getString(getContentResolver(), "firebase.test.lab")))
+        {
+            return false; // testing the menu is not very interesting
+        }
         final MenuItem sort = menu.add(getString(R.string.sortDicts));
         MenuItemCompat.setShowAsAction(sort, MenuItem.SHOW_AS_ACTION_NEVER);
         sort.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -657,6 +663,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
             } else {
                 button.setEnabled(false);
+                button.setFocusable(false);
             }
             if (builder.length() != 0) {
                 builder.append("; ");
@@ -680,7 +687,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                                    DictionaryActivity.getLaunchIntent(getApplicationContext(),
                                            application.getPath(dictionaryInfo.uncompressedFilename),
                                            dictionaryInfo.indexInfos.get(0).shortName, "")));
-            row.setFocusable(true);
+            // do not setFocusable, for keyboard navigation
+            // offering only the index buttons is better.
             row.setLongClickable(true);
         }
         row.setBackgroundResource(android.R.drawable.menuitem_background);