Merge "Hide tap to wake on devices that don't support it" into mnc-dev

src/com/android/settings/DisplaySettings.java

@@ -490,6 +490,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
                     if (!RotationPolicy.isRotationLockToggleVisible(context)) {
                         result.add(KEY_AUTO_ROTATE);
                     }
+                    if (!isTapToWakeAvailable(context.getResources())) {
+                        result.add(KEY_TAP_TO_WAKE);
+                    }
                     return result;
                 }
             };