Bug 1215959 - (GeckoCaret2) update experimental prefs, r=snorp
authorMark Capella <markcapella@twcny.rr.com>
Tue, 01 Dec 2015 15:25:06 -0500
changeset 309158 6932b15cf96062fb80873c740708c499c8a5d5ef
parent 309157 8da9e39091c4deef40b0c9d6a3db332e86415194
child 309159 f6e63dd4fd9c31388e25c64f1c4e11ccdd9cbe88
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1215959
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1215959 - (GeckoCaret2) update experimental prefs, r=snorp
mobile/android/app/mobile.js
mobile/android/b2gdroid/app/b2gdroid.js
modules/libpref/init/all.js
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -892,43 +892,25 @@ pref("reader.toolbar.vertical", false);
 
 // Whether or not to display buttons related to reading list in reader view.
 pref("browser.readinglist.enabled", true);
 
 // Telemetry settings.
 // Whether to use the unified telemetry behavior, requires a restart.
 pref("toolkit.telemetry.unified", false);
 
-// Turn off selection caret by default
-pref("selectioncaret.enabled", false);
-
-// Selection carets never fall-back to internal LongTap detector.
-pref("selectioncaret.detects.longtap", false);
-
-// Selection carets override caret visibility.
-pref("selectioncaret.visibility.affectscaret", true);
-
-// Selection caret visibility observes composition
-// selections generated by soft keyboard managers.
-pref("selectioncaret.observes.compositions", true);
+// Unified AccessibleCarets (touch-caret and selection-carets).
+pref("layout.accessiblecaret.enabled", false);
+// Android generates long tap (mouse) events.
+pref("layout.accessiblecaret.use_long_tap_injector", false);
 
-// Turn off touch caret by default.
-pref("touchcaret.enabled", false);
-
-// TouchCaret never auto-hides.
-pref("touchcaret.expiration.time", 0);
-
-// Touch caret stays visible under a wider range of conditions
-// than the default b2g. We can display the caret in empty editables
-// for example, and do not auto-hide until loss of focus.
-pref("touchcaret.extendedvisibility", true);
-
-// The TouchCaret and the SelectionCarets will indicate when the
-// TextSelection actionbar is to be openned or closed.
-pref("caret.manages-android-actionbar", true);
+// Android tries to maintain extended visibility of the AccessibleCarets
+// during Selection change notifications generated by Javascript,
+// or misc internal events.
+pref("layout.accessiblecaret.extendedvisibility", true);
 
 // Disable sending console to logcat on release builds.
 #ifdef RELEASE_BUILD
 pref("consoleservice.logcat", false);
 #else
 pref("consoleservice.logcat", true);
 #endif
 
--- a/mobile/android/b2gdroid/app/b2gdroid.js
+++ b/mobile/android/b2gdroid/app/b2gdroid.js
@@ -886,44 +886,16 @@ pref("reader.toolbar.vertical", false);
 
 // Whether or not to display buttons related to reading list in reader view.
 pref("browser.readinglist.enabled", true);
 
 // Telemetry settings.
 // Whether to use the unified telemetry behavior, requires a restart.
 pref("toolkit.telemetry.unified", false);
 
-// Turn off selection caret by default
-pref("selectioncaret.enabled", false);
-
-// Selection carets never fall-back to internal LongTap detector.
-pref("selectioncaret.detects.longtap", false);
-
-// Selection carets override caret visibility.
-pref("selectioncaret.visibility.affectscaret", true);
-
-// Selection caret visibility observes composition
-// selections generated by soft keyboard managers.
-pref("selectioncaret.observes.compositions", true);
-
-// Turn off touch caret by default.
-pref("touchcaret.enabled", false);
-
-// TouchCaret never auto-hides.
-pref("touchcaret.expiration.time", 0);
-
-// Touch caret stays visible under a wider range of conditions
-// than the default b2g. We can display the caret in empty editables
-// for example, and do not auto-hide until loss of focus.
-pref("touchcaret.extendedvisibility", true);
-
-// The TouchCaret and the SelectionCarets will indicate when the
-// TextSelection actionbar is to be openned or closed.
-pref("caret.manages-android-actionbar", true);
-
 // Disable sending console to logcat on release builds.
 #ifdef RELEASE_BUILD
 pref("consoleservice.logcat", false);
 #else
 pref("consoleservice.logcat", true);
 #endif
 
 // Enable Cardboard VR on mobile, assuming VR at all is enabled
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4870,35 +4870,16 @@ pref("touchcaret.expiration.time", 3000)
 
 // Original caret implementation on non-collapsed selection.
 pref("selectioncaret.enabled", false);
 
 // This will inflate size of selection caret frame when we checking if
 // user click on selection caret or not. In app units.
 pref("selectioncaret.inflatesize.threshold", 40);
 
-// Selection carets will fall-back to internal LongTap detector.
-pref("selectioncaret.detects.longtap", true);
-
-// Selection carets do not affect caret visibility.
-pref("selectioncaret.visibility.affectscaret", false);
-
-// Selection caret visibility does not observe composition
-// selections generated by soft keyboard managers.
-pref("selectioncaret.observes.compositions", false);
-
-// The Touch caret by default observes the b2g visibility rules, and
-// not the extended Android visibility rules that allow for touchcaret
-// display in empty editable fields, for example.
-pref("touchcaret.extendedvisibility", false);
-
-// Desktop and b2g don't need to open or close the Android
-// TextSelection (Actionbar) utility.
-pref("caret.manages-android-actionbar", false);
-
 // New implementation to unify touch-caret and selection-carets.
 pref("layout.accessiblecaret.enabled", false);
 
 // CSS attributes of the AccessibleCaret in CSS pixels.
 pref("layout.accessiblecaret.width", "34.0");
 pref("layout.accessiblecaret.height", "36.0");
 pref("layout.accessiblecaret.margin-left", "-18.5");
 pref("layout.accessiblecaret.bar.width", "2.0");
@@ -4906,16 +4887,20 @@ pref("layout.accessiblecaret.bar.width",
 // Timeout in milliseconds to hide the accessiblecaret under cursor mode while
 // no one touches it. Set the value to 0 to disable this feature.
 pref("layout.accessiblecaret.timeout_ms", 3000);
 
 // Simulate long tap to select words on the platforms where APZ is not enabled
 // or long tap events does not fired by APZ.
 pref("layout.accessiblecaret.use_long_tap_injector", true);
 
+// Selection change notifications generated by Javascript, or misc internal
+// events hide AccessibleCarets by default.
+pref("layout.accessiblecaret.extendedvisibility", false);
+
 // Wakelock is disabled by default.
 pref("dom.wakelock.enabled", false);
 
 // The URL of the Firefox Accounts auth server backend
 pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
 
 // disable mozsample size for now
 pref("image.mozsamplesize.enabled", false);