ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Close #26495: Move Huawei checks to ManufacturerCodes

This commit is contained in:
Jonathan Almeida 2022-08-16 18:21:53 -04:00 committed by mergify[bot]
parent 32b635d5c8
commit 94ff169a30
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -127,6 +127,7 @@ import org.mozilla.fenix.theme.DefaultThemeManager
import org.mozilla.fenix.theme.ThemeManager
import org.mozilla.fenix.trackingprotection.TrackingProtectionPanelDialogFragmentDirections
import org.mozilla.fenix.utils.BrowsersCache
import org.mozilla.fenix.utils.ManufacturerCodes
import org.mozilla.fenix.utils.Settings
import java.lang.ref.WeakReference
@ -617,8 +618,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
Build.VERSION.SDK_INT == Build.VERSION_CODES.N || Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
// Huawei devices seem to have problems with onKeyLongPress
// See https://github.com/mozilla-mobile/fenix/issues/13498
val isHuawei = Build.MANUFACTURER.equals("huawei", ignoreCase = true)
return isAndroidN || isHuawei
return isAndroidN || ManufacturerCodes.isHuawei
}
private fun handleBackLongPress(): Boolean {

1
app/src/main/java/org/mozilla/fenix/utils/ManufacturerCodes.kt
View File

@ -19,4 +19,5 @@ object ManufacturerCodes {
val isLG get() = Build.MANUFACTURER.equals(LG, ignoreCase = true)
val isSamsung get() = Build.MANUFACTURER.equals(SAMSUNG, ignoreCase = true)
val isHuawei get() = Build.MANUFACTURER.equals(HUAWEI, ignoreCase = true)
}