blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Reverts #6925: Make home screen full screen

master
mcarare 2019-12-13 18:47:29 +02:00 committed by Jeff Boek
parent a8f895cb5c
commit ef53e1ff8e
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -13,8 +13,6 @@ import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.Window
import android.view.WindowManager
import android.widget.Button import android.widget.Button
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.PopupWindow import android.widget.PopupWindow
@ -212,28 +210,9 @@ class HomeFragment : Fragment() {
activity.themeManager.applyStatusBarTheme(activity) activity.themeManager.applyStatusBarTheme(activity)
setFragmentFullScreen(this.activity?.window, view.homeLayout)
return view return view
} }
private fun setFragmentFullScreen(window: Window?, homeScreen: View) {
window?.decorView?.setOnApplyWindowInsetsListener { _, insets ->
homeScreen.setPadding(
homeScreen.paddingLeft,
homeScreen.paddingTop + insets.stableInsetTop,
homeScreen.paddingRight,
homeScreen.paddingBottom + insets.stableInsetBottom
)
window.decorView.setOnApplyWindowInsetsListener(null)
insets.consumeSystemWindowInsets()
}
}
@ExperimentalCoroutinesApi @ExperimentalCoroutinesApi
@SuppressWarnings("LongMethod") @SuppressWarnings("LongMethod")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -459,8 +438,6 @@ class HomeFragment : Fragment() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
this.activity?.window?.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
hideToolbar() hideToolbar()
} }
@ -796,11 +773,6 @@ class HomeFragment : Fragment() {
} }
} }
override fun onPause() {
this.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
super.onPause()
}
companion object { companion object {
private const val NON_TAB_ITEM_NUM = 3 private const val NON_TAB_ITEM_NUM = 3
private const val ANIM_SCROLL_DELAY = 100L private const val ANIM_SCROLL_DELAY = 100L

2
app/src/main/res/values/styles.xml
View File

@ -140,7 +140,7 @@
<!-- Drawables --> <!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_private</item> <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
<item name="homeBackground">@drawable/private_home_background_gradient</item> <item name="homeBackground">@drawable/private_home_background_gradient</item>
<item name="bottomBarBackground">@android:color/transparent</item> <item name="bottomBarBackground">@drawable/private_home_bottom_bar_background_gradient</item>
<item name="privateBrowsingButtonBackground">@color/primary_text_private_theme</item> <item name="privateBrowsingButtonBackground">@color/primary_text_private_theme</item>
<item name="privateBrowsingButtonAccent">@color/above_private_theme</item> <item name="privateBrowsingButtonAccent">@color/above_private_theme</item>
<item name="shieldLottieFile">@raw/shield_json_dark</item> <item name="shieldLottieFile">@raw/shield_json_dark</item>