Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1178503 - Remove nightly-only flag for QR code input. r=liuche

Browse Source 
--HG--
extra : commitid : EMVHezunff4
extra : rebase_source : 69b9c0e6631f09239426dfc483922d7069ab53f2
This commit is contained in:
Karim Benhmida 2015-07-21 13:23:57 -07:00
parent cd73adcffe
commit 15adba3488
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/preferences/GeckoPreferences.java
View File

@ -831,7 +831,7 @@ OnSharedPreferenceChangeListener
continue;
}
} else if (PREFS_QRCODE_ENABLED.equals(key)) {
if (!AppConstants.NIGHTLY_BUILD || !InputOptionsUtils.supportsQrCodeReader(getApplicationContext())) {
if (!InputOptionsUtils.supportsQrCodeReader(getApplicationContext())) {
// Remove UI for qr code input on non nightly builds
preferences.removePreference(pref);
i--;

4
mobile/android/base/toolbar/ToolbarEditLayout.java
View File

@ -253,10 +253,6 @@ public class ToolbarEditLayout extends ThemedLinearLayout {
}
private boolean qrCodeIsEnabled(Context context) {
// QR code is enabled for nightly only
if(!AppConstants.NIGHTLY_BUILD) {
return false;
}
final boolean qrCodeIsSupported = InputOptionsUtils.supportsQrCodeReader(context);
if (!qrCodeIsSupported) {
return false;