| commit | 372f7a382443bfc639148b355f6d106aa3b70294 | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Fri Jun 17 18:46:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:46:42 2016 +0000 |
| tree | 635d4749e481eefd436a162055e20ba78de84986 | |
| parent | 8345efb46bb99fff62b1e5b844a248419817daf5 [diff] | |
| parent | ccead48cc6182ec7e3353450700d66a77d59b752 [diff] |
Merge \\\"Use correct switch/checkbox ID in accessibility code\\\" into nyc-dev am: ac2029950f am: a8e77aa2ee am: ccead48cc6 Change-Id: Ifb974efc875acb59177a9ec755bf653228d1b918
diff --git a/v14/preference/src/android/support/v14/preference/SwitchPreference.java b/v14/preference/src/android/support/v14/preference/SwitchPreference.java index 3f95d1a..6e4b0d7 100644 --- a/v14/preference/src/android/support/v14/preference/SwitchPreference.java +++ b/v14/preference/src/android/support/v14/preference/SwitchPreference.java
@@ -217,7 +217,7 @@ return; } - View switchView = view.findViewById(android.support.v7.preference.R.id.switchWidget); + View switchView = view.findViewById(AndroidResources.ANDROID_R_SWITCH_WIDGET); syncSwitchView(switchView); View summaryView = view.findViewById(android.R.id.summary);
diff --git a/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java b/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java index b6dad92..fa4463b 100644 --- a/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java +++ b/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java
@@ -109,7 +109,7 @@ return; } - View checkboxView = view.findViewById(android.support.v7.appcompat.R.id.checkbox); + View checkboxView = view.findViewById(android.R.id.checkbox); syncCheckboxView(checkboxView); View summaryView = view.findViewById(android.R.id.summary);