Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1266668 - Remove Nightly flags from new ActionBar and floating text selection. r=capella

Browse Source 
MozReview-Commit-ID: KpIJeCn2Gj4

--HG--
extra : amend_source : 66eb4430e2bde29b50a15d7183c5c28dff442ce5
This commit is contained in:
Sebastian Kaspari 2016-04-22 12:19:23 +02:00
parent 72c1e6f5ac
commit 4d4e8baaee
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
View File

@ -1270,7 +1270,7 @@ public abstract class GeckoApp
// Use global layout state change to kick off additional initialization
mMainLayout.getViewTreeObserver().addOnGlobalLayoutListener(this);
if (Versions.preMarshmallow || !AppConstants.NIGHTLY_BUILD) {
if (Versions.preMarshmallow) {
mTextSelection = new ActionBarTextSelection(
(TextSelectionHandle) findViewById(R.id.anchor_handle),
(TextSelectionHandle) findViewById(R.id.caret_handle),

20
mobile/android/chrome/content/browser.js
View File

@ -156,12 +156,12 @@ var lazilyLoadedObserverScripts = [
["Reader", ["Reader:FetchContent", "Reader:AddToCache", "Reader:RemoveFromCache"], "chrome://browser/content/Reader.js"],
["PrintHelper", ["Print:PDF"], "chrome://browser/content/PrintHelper.js"],
];
if (AppConstants.NIGHTLY_BUILD) {
lazilyLoadedObserverScripts.push(
["ActionBarHandler", ["TextSelection:Get", "TextSelection:Action", "TextSelection:End"],
"chrome://browser/content/ActionBarHandler.js"]
);
}
lazilyLoadedObserverScripts.push(
["ActionBarHandler", ["TextSelection:Get", "TextSelection:Action", "TextSelection:End"],
"chrome://browser/content/ActionBarHandler.js"]
);
if (AppConstants.MOZ_WEBRTC) {
lazilyLoadedObserverScripts.push(
["WebrtcUI", ["getUserMedia:request",
@ -549,11 +549,9 @@ var BrowserApp = {
}, false);
// Pass caret StateChanged events to ActionBarHandler.
if (AppConstants.NIGHTLY_BUILD) {
window.addEventListener("mozcaretstatechanged", e => {
ActionBarHandler.caretStateChangedHandler(e);
}, /* useCapture = */ true, /* wantsUntrusted = */ false);
}
window.addEventListener("mozcaretstatechanged", e => {
ActionBarHandler.caretStateChangedHandler(e);
}, /* useCapture = */ true, /* wantsUntrusted = */ false);
},
get _startupStatus() {