blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #2000 - Don't flash LeakCanary setting in release builds (#2006)

master
Emily Kager 2019-04-25 07:42:00 -07:00 committed by Sawyer Blatz
parent 10517580cc
commit 4da5a26536
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -31,6 +31,7 @@ android {
testInstrumentationRunnerArguments clearPackageData: 'true'
manifestPlaceholders.isRaptorEnabled = "false"
buildConfigField "boolean", "IS_RELEASED", "false"
resValue "bool", "IS_NOT_RELEASED", "true"
}
def releaseTemplate = {
@ -53,9 +54,11 @@ android {
}
nightly releaseTemplate >> {
buildConfigField "boolean", "IS_RELEASED", "true"
resValue "bool", "IS_NOT_RELEASED", "false"
}
beta releaseTemplate >> {
buildConfigField "boolean", "IS_RELEASED", "true"
resValue "bool", "IS_NOT_RELEASED", "false"
}
}

1
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -198,7 +198,6 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
preferenceMakeDefaultBrowser?.onPreferenceClickListener =
getClickListenerForMakeDefaultBrowser()
preferenceLeakCanary?.isVisible = !BuildConfig.IS_RELEASED
if (!BuildConfig.IS_RELEASED) {
preferenceLeakCanary?.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { _, newValue ->

3
app/src/main/res/xml/preferences.xml
View File

@ -58,10 +58,11 @@
android:key="@string/pref_key_data_choices"
android:title="@string/preferences_data_choices" />
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:icon="@drawable/ic_info"
android:key="@string/pref_key_leakcanary"
android:title="@string/preference_leakcanary"
android:defaultValue="false" />
app:isPreferenceVisible="@bool/IS_NOT_RELEASED" />
</androidx.preference.PreferenceCategory>
<PreferenceCategory