Bug 1301593 - Block versions of the Galaxy Note 4 from using the dynamic toolbar as well. r?sebastian
MozReview-Commit-ID: KOlIwP8xLhy
--- a/mobile/android/base/java/org/mozilla/gecko/DynamicToolbar.java
+++ b/mobile/android/base/java/org/mozilla/gecko/DynamicToolbar.java
@@ -55,19 +55,27 @@ public class DynamicToolbar {
}
public static boolean isForceDisabled() {
// Force-disable dynamic toolbar on the variants of the Galaxy Note 10.1
// and Note 8.0 running Android 4.1.2. (Bug 1231554). This includes
// the following model numbers:
// GT-N8000, GT-N8005, GT-N8010, GT-N8013, GT-N8020
// GT-N5100, GT-N5110, GT-N5120
- return Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN
+ if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN
&& (Build.MODEL.startsWith("GT-N80") ||
- Build.MODEL.startsWith("GT-N51"));
+ Build.MODEL.startsWith("GT-N51"))) {
+ return true;
+ }
+ // Also disable variants of the Galaxy Note 4 on Android 5.0.1 (Bug 1301593)
+ if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
+ && (Build.MODEL.startsWith("SM-910"))) {
+ return true;
+ }
+ return false;
}
public void destroy() {
PrefsHelper.removeObserver(prefObserver);
}
public void setLayerView(LayerView layerView) {
ThreadUtils.assertOnUiThread();