Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java

@@ -367,6 +367,10 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
+
+        if (mHardwareTypeCheckBox.isChecked()) {
+            AccessibilityUtil.skipVolumeShortcutDialogTimeoutRestriction(getPrefContext());
+        }
     }
 
     @Override