Commit 240326b5 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by henry
Browse files

fixup! [android] Modify UI/UX 

Revert some changes introduced by this commit to
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
to fix 144 build errors.
parent 8f2aaa0e

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

+2 −14
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ import android.os.Handler 
import android.os.Looper

import android.view.LayoutInflater

import android.view.View

import android.view.WindowManager

import android.widget.Toast

import androidx.annotation.VisibleForTesting

import androidx.core.app.NotificationManagerCompat
@@ -43,6 +42,7 @@ import mozilla.components.support.base.feature.ViewBoundFeatureWrapper 
import mozilla.components.support.ktx.android.view.showKeyboard

import mozilla.components.ui.widgets.withCenterAlignedButtons

import mozilla.telemetry.glean.private.NoExtras

import org.mozilla.fenix.BrowserDirection

import org.mozilla.fenix.Config

import org.mozilla.fenix.FeatureFlags

import org.mozilla.fenix.GleanMetrics.Addons
@@ -51,6 +51,7 @@ import org.mozilla.fenix.GleanMetrics.Events 
import org.mozilla.fenix.GleanMetrics.SettingsSearch

import org.mozilla.fenix.GleanMetrics.TrackingProtection

import org.mozilla.fenix.GleanMetrics.Translations

import org.mozilla.fenix.HomeActivity

import org.mozilla.fenix.R

import org.mozilla.fenix.components.Components

import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint
@@ -555,19 +556,6 @@ class SettingsFragment : PreferenceFragmentCompat() { 
        val preferenceMakeDefaultBrowser =

            requirePreference<DefaultBrowserPreference>(R.string.pref_key_make_default_browser)



        requirePreference<Preference>(R.string.pref_key_allow_screenshots_in_private_mode).apply {

            onPreferenceChangeListener = object : SharedPreferenceUpdater() {

                override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {

                    if (newValue == false) {

                        activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)

                    } else {

                        activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)

                    }

                    return super.onPreferenceChange(preference, newValue)

                }

            }

        }



        if (!Config.channel.isReleased) {

            preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue ->

                val isEnabled = newValue == true

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorHomePage.kt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.padding 
import androidx.compose.foundation.layout.size

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.material.Text

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class SearchWidgetProvider : AppWidgetProvider() { 
        // gradient color available for android:fillColor only on SDK 24+

        setImageViewResource(

            R.id.button_search_widget_new_tab_icon,

            R.drawable.R.mipmap.ic_launcher_foreground,

            R.drawable.ic_launcher_foreground,

        )



        val appName = context.getString(R.string.app_name)

mobile/android/fenix/app/src/main/res/layout/fragment_about.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            android:layout_marginEnd="130dp"

            android:contentDescription="@string/app_name"

            android:importantForAccessibility="no"

            app:srcCompat="@mipmap/ic_launcher_foreground"

            app:srcCompat="@drawable/ic_launcher_foreground"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="parent" />

mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        android:layout_gravity="center"

        android:contentDescription="@string/search_widget_content_description_2"

        android:scaleType="centerInside"

        tools:src="@mipmap/ic_launcher_foreground"

        tools:src="@drawable/ic_launcher_foreground"

        android:scaleX="1.5"

        android:scaleY="1.5"/>