@@ -10,13 +10,11 @@ package im.vector.app.core.platform
10
10
import android.annotation.SuppressLint
11
11
import android.app.Activity
12
12
import android.content.Context
13
- import android.os.Build
14
13
import android.os.Bundle
15
14
import android.view.Menu
16
15
import android.view.MenuInflater
17
16
import android.view.MenuItem
18
17
import android.view.View
19
- import android.view.WindowInsetsController
20
18
import android.view.WindowManager
21
19
import android.widget.TextView
22
20
import androidx.annotation.CallSuper
@@ -25,7 +23,6 @@ import androidx.annotation.StringRes
25
23
import androidx.appcompat.app.AppCompatActivity
26
24
import androidx.coordinatorlayout.widget.CoordinatorLayout
27
25
import androidx.core.app.MultiWindowModeChangedInfo
28
- import androidx.core.content.ContextCompat
29
26
import androidx.core.util.Consumer
30
27
import androidx.core.view.MenuProvider
31
28
import androidx.core.view.isVisible
@@ -336,7 +333,8 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
336
333
private fun handleCertificateError (certificateError : GlobalError .CertificateError ) {
337
334
singletonEntryPoint()
338
335
.unrecognizedCertificateDialog()
339
- .show(this ,
336
+ .show(
337
+ this ,
340
338
certificateError.fingerprint,
341
339
object : UnrecognizedCertificateDialog .Callback {
342
340
override fun onAccept () {
@@ -446,14 +444,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
446
444
mdmService.unregisterListener(this )
447
445
}
448
446
449
- override fun onWindowFocusChanged (hasFocus : Boolean ) {
450
- super .onWindowFocusChanged(hasFocus)
451
-
452
- if (hasFocus && displayInFullscreen()) {
453
- setFullScreen()
454
- }
455
- }
456
-
457
447
private val onMultiWindowModeChangedListener = Consumer <MultiWindowModeChangedInfo > {
458
448
Timber .w(" onMultiWindowModeChanged. isInMultiWindowMode: ${it.isInMultiWindowMode} " )
459
449
bugReporter.inMultiWindowMode = it.isInMultiWindowMode
@@ -463,33 +453,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
463
453
* PRIVATE METHODS
464
454
* ========================================================================================== */
465
455
466
- /* *
467
- * Force to render the activity in fullscreen.
468
- */
469
- private fun setFullScreen () {
470
- if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .R ) {
471
- // New API instead of SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
472
- @Suppress(" DEPRECATION" )
473
- window.setDecorFitsSystemWindows(false )
474
- // New API instead of SYSTEM_UI_FLAG_IMMERSIVE
475
- window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController .BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
476
- // New API instead of FLAG_TRANSLUCENT_STATUS
477
- @Suppress(" DEPRECATION" )
478
- window.statusBarColor = ContextCompat .getColor(this , im.vector.lib.ui.styles.R .color.half_transparent_status_bar)
479
- // New API instead of FLAG_TRANSLUCENT_NAVIGATION
480
- @Suppress(" DEPRECATION" )
481
- window.navigationBarColor = ContextCompat .getColor(this , im.vector.lib.ui.styles.R .color.half_transparent_status_bar)
482
- } else {
483
- @Suppress(" DEPRECATION" )
484
- window.decorView.systemUiVisibility = (View .SYSTEM_UI_FLAG_LAYOUT_STABLE
485
- or View .SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
486
- or View .SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
487
- or View .SYSTEM_UI_FLAG_HIDE_NAVIGATION
488
- or View .SYSTEM_UI_FLAG_FULLSCREEN
489
- or View .SYSTEM_UI_FLAG_IMMERSIVE_STICKY )
490
- }
491
- }
492
-
493
456
private fun handleMenuItemHome (item : MenuItem ): Boolean {
494
457
return when (item.itemId) {
495
458
android.R .id.home -> {
@@ -591,8 +554,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
591
554
592
555
abstract fun getBinding (): VB
593
556
594
- open fun displayInFullscreen () = false
595
-
596
557
open fun doBeforeSetContentView () = Unit
597
558
598
559
open fun initUiAndData () = Unit
0 commit comments