commit 368daafc34de1a7831d485b6a06fbe0d6bcf1cd4
author Amith Yamasani <yamasani@google.com> Thu Oct 24 19:21:12 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 24 19:21:12 2013 +0000
tree b6f53bebea7556ac018f9ea0ea2b9329f555cadf
parent 5ecfb557b1d38537b7a484505b550000980d17f1
parent 34d41e9a85f4e2e092b5eb8c7fa4554254650fe4

Merge "Only simulate the first click if "Always use" button is available" into klp-dev

core/java/com/android/internal/app/ResolverActivity.java

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index cd853b6..591267e 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -181,11 +181,12 @@
             } else {
                 mAlwaysUseOption = false;
             }
-        }
-        final int initialHighlight = mAdapter.getInitialHighlight();
-        if (initialHighlight >= 0) {
-            mListView.setItemChecked(initialHighlight, true);
-            onItemClick(null, null, initialHighlight, 0); // Other entries are not used
+            // Set the initial highlight if there was a preferred or last used choice
+            final int initialHighlight = mAdapter.getInitialHighlight();
+            if (initialHighlight >= 0) {
+                mListView.setItemChecked(initialHighlight, true);
+                onItemClick(null, null, initialHighlight, 0); // Other entries are not used
+            }
         }
     }