Commit 9ee8c009 authored by Tiger Oakes's avatar Tiger Oakes Committed by Sawyer Blatz
Browse files

For #4774 - Use vector drawable compat (#4811)

parent ad98b2f3

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 
- Remove forced focus of toolbar on homescreen

- #4529 - Fixed an issue where the app would sometimes return to a blank toolbar

- #4427 - Fixed an issue where the app would sometimes return to the home fragment

- #4774 - Fixed how the tracking protection and HTTP icon appear in quick settings on Android 5 and 6.



### Removed

app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsUIView.kt

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class QuickSettingsUIView( 
            drawableTint = R.color.photonGreen50

        } else {

            stringId = R.string.quick_settings_sheet_insecure_connection

            drawableId = R.drawable.mozac_ic_globe

            drawableId = R.drawable.mozac_ic_broken_lock

            drawableTint = R.color.photonRed50

        }

app/src/main/java/org/mozilla/fenix/settings/quicksettings/TrackingProtectionSettingView.kt

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import android.view.View 
import android.widget.CompoundButton

import android.widget.Switch

import android.widget.TextView

import androidx.appcompat.content.res.AppCompatResources

import androidx.core.view.isVisible

import io.reactivex.Observer

import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
@@ -23,7 +24,7 @@ class TrackingProtectionSettingView( 


    init {

        trackingProtectionSwitch.putCompoundDrawablesRelativeWithIntrinsicBounds(

            start = container.context.getDrawable(R.drawable.ic_tracking_protection)

            start = AppCompatResources.getDrawable(container.context, R.drawable.ic_tracking_protection)

        )

    }