diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-07-22 17:05:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-22 17:05:26 -0700 |
| commit | d1b4c10fedc04384f40ba7fc30115a1380ce014f (patch) | |
| tree | 8ade9031de9a1f40aa31fa6399332588a6b9d735 | |
| parent | ad55d35114237071133eb28ded93a014185d4e35 (diff) | |
| parent | 610d1f1faefd353aa15f57dfa965528036178eae (diff) | |
| download | frameworks_base-d1b4c10fedc04384f40ba7fc30115a1380ce014f.zip frameworks_base-d1b4c10fedc04384f40ba7fc30115a1380ce014f.tar.gz frameworks_base-d1b4c10fedc04384f40ba7fc30115a1380ce014f.tar.bz2 | |
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
| -rw-r--r-- | core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java b/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java index aedfbad..2ed7c52 100644 --- a/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java +++ b/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java @@ -95,7 +95,7 @@ public class AccessibilityInjectorTest private WebView mWebView; /** Used for caching the default bindings so they can be restored. */ - private String mDefaultKeyBindings; + private static String sDefaultKeyBindings; /** The received selection string for assertion checking. */ private static String sReceivedSelectionString = SELECTION_STRING_UNKNOWN; @@ -1696,7 +1696,7 @@ public class AccessibilityInjectorTest */ private void injectTestWebContentKeyBindings() { ContentResolver contentResolver = getActivity().getContentResolver(); - mDefaultKeyBindings = Settings.Secure.getString(contentResolver, + sDefaultKeyBindings = Settings.Secure.getString(contentResolver, Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS); Settings.Secure.putString(contentResolver, Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, TEST_KEY_DINDINGS); @@ -1708,7 +1708,7 @@ public class AccessibilityInjectorTest private void restoreDefaultWebContentKeyBindings() { Settings.Secure.putString(getActivity().getContentResolver(), Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, - mDefaultKeyBindings); + sDefaultKeyBindings); } /** |