зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 3c03b94342b9 (bug 1329152)
This commit is contained in:
Родитель
a157d1a655
Коммит
ddd92794b2
|
@ -65,9 +65,6 @@ public class Experiments {
|
|||
// Enable Activity stream by default for users in the "opt out" group.
|
||||
public static final String ACTIVITY_STREAM_OPT_OUT = "activity-stream-opt-out";
|
||||
|
||||
// User in this group will enable Custom Tabs
|
||||
public static final String CUSTOM_TABS = "custom-tabs";
|
||||
|
||||
// Tabs tray: Arrange tabs in two columns in portrait mode
|
||||
public static final String COMPACT_TABS = "compact-tabs";
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
package org.mozilla.gecko;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
|
@ -15,7 +14,6 @@ import android.support.customtabs.CustomTabsIntent;
|
|||
import android.util.Log;
|
||||
|
||||
import org.mozilla.gecko.home.HomeConfig;
|
||||
import org.mozilla.gecko.switchboard.SwitchBoard;
|
||||
import org.mozilla.gecko.webapps.WebAppActivity;
|
||||
import org.mozilla.gecko.webapps.WebAppIndexer;
|
||||
import org.mozilla.gecko.customtabs.CustomTabsActivity;
|
||||
|
@ -67,7 +65,7 @@ public class LauncherActivity extends Activity {
|
|||
} else if (!isViewIntentWithURL(safeIntent)) {
|
||||
dispatchNormalIntent();
|
||||
|
||||
} else if (isCustomTabsIntent(safeIntent) && isCustomTabsEnabled(this) ) {
|
||||
} else if (isCustomTabsIntent(safeIntent)) {
|
||||
dispatchCustomTabsIntent();
|
||||
|
||||
// Can we dispatch this VIEW action intent to the tab queue service?
|
||||
|
@ -149,10 +147,6 @@ public class LauncherActivity extends Activity {
|
|||
&& safeIntent.getDataString() != null;
|
||||
}
|
||||
|
||||
private static boolean isCustomTabsEnabled(@NonNull final Context context) {
|
||||
return SwitchBoard.isInExperiment(context, Experiments.CUSTOM_TABS);
|
||||
}
|
||||
|
||||
private static boolean isCustomTabsIntent(@NonNull final SafeIntent safeIntent) {
|
||||
return isViewIntentWithURL(safeIntent)
|
||||
&& safeIntent.hasExtra(CustomTabsIntent.EXTRA_SESSION);
|
||||
|
|
Загрузка…
Ссылка в новой задаче