blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Removes usage of COLLECTIONS_ENABLED flag

master
Sawyer Blatz 2019-05-21 10:07:17 -07:00
parent 0c022f6646
commit f73bb22955
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -133,8 +133,6 @@ android.applicationVariants.all { variant ->
def releaseChannels = ["nightly", "beta", "release"] def releaseChannels = ["nightly", "beta", "release"]
def isReleased = releaseChannels.contains(buildType) def isReleased = releaseChannels.contains(buildType)
buildConfigField 'Boolean', 'COLLECTIONS_ENABLED', (!isReleased).toString()
if (isReleased) { if (isReleased) {
versionCode = generatedVersionCode versionCode = generatedVersionCode

5
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlUIView.kt
View File

@ -14,7 +14,6 @@ import io.reactivex.functions.Consumer
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.mvi.UIView import org.mozilla.fenix.mvi.UIView
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import org.mozilla.fenix.BuildConfig
private fun normalModeAdapterItems( private fun normalModeAdapterItems(
tabs: List<Tab>, tabs: List<Tab>,
@ -26,9 +25,7 @@ private fun normalModeAdapterItems(
if (tabs.isNotEmpty()) { if (tabs.isNotEmpty()) {
items.addAll(tabs.reversed().map(AdapterItem::TabItem)) items.addAll(tabs.reversed().map(AdapterItem::TabItem))
if (BuildConfig.COLLECTIONS_ENABLED) { items.add(AdapterItem.SaveTabGroup)
items.add(AdapterItem.SaveTabGroup)
}
} else { } else {
items.add(AdapterItem.NoTabMessage) items.add(AdapterItem.NoTabMessage)
} }