Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-07-22 17:05:26 -07:00
committed by Android (Google) Code Review
parent ad55d35114 610d1f1fae
commit d1b4c10fed
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
View File

@@ -95,7 +95,7 @@ public class AccessibilityInjectorTest
private WebView mWebView; private WebView mWebView;
/** Used for caching the default bindings so they can be restored. */ /** 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. */ /** The received selection string for assertion checking. */
private static String sReceivedSelectionString = SELECTION_STRING_UNKNOWN; private static String sReceivedSelectionString = SELECTION_STRING_UNKNOWN;
@@ -1696,7 +1696,7 @@ public class AccessibilityInjectorTest
*/ */
private void injectTestWebContentKeyBindings() { private void injectTestWebContentKeyBindings() {
ContentResolver contentResolver = getActivity().getContentResolver(); ContentResolver contentResolver = getActivity().getContentResolver();
mDefaultKeyBindings = Settings.Secure.getString(contentResolver, sDefaultKeyBindings = Settings.Secure.getString(contentResolver,
Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS); Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS);
Settings.Secure.putString(contentResolver, Settings.Secure.putString(contentResolver,
Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, TEST_KEY_DINDINGS); Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, TEST_KEY_DINDINGS);
@@ -1708,7 +1708,7 @@ public class AccessibilityInjectorTest
private void restoreDefaultWebContentKeyBindings() { private void restoreDefaultWebContentKeyBindings() {
Settings.Secure.putString(getActivity().getContentResolver(), Settings.Secure.putString(getActivity().getContentResolver(),
Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS,
mDefaultKeyBindings); sDefaultKeyBindings);
} }
/** /**