Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Issue 5366 Vector Drawable Compat (#6904)

Browse Source
staging
kglazko 5 years ago committed by GitHub
parent 2225b7154a
commit 300d8317e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
Unescape Escape View File

@ -9,8 +9,8 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.appcompat.content.res.AppCompatResources
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
import androidx.core.widget.TextViewCompat import androidx.core.widget.TextViewCompat
import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.BaseTransientBottomBar
import com.google.android.material.snackbar.ContentViewCallback import com.google.android.material.snackbar.ContentViewCallback
@ -32,9 +32,9 @@ class FenixSnackbar private constructor(
view.background = null view.background = null
view.snackbar_layout.background = if (isError) { view.snackbar_layout.background = if (isError) {
ContextCompat.getDrawable(context, R.drawable.fenix_snackbar_error_background) AppCompatResources.getDrawable(context, R.drawable.fenix_snackbar_error_background)
} else { } else {
ContextCompat.getDrawable(context, R.drawable.fenix_snackbar_background) AppCompatResources.getDrawable(context, R.drawable.fenix_snackbar_background)
} }
content.snackbar_btn.increaseTapArea(actionButtonIncreaseDps) content.snackbar_btn.increaseTapArea(actionButtonIncreaseDps)

6
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
Unescape Escape View File

@ -7,7 +7,7 @@ package org.mozilla.fenix.home.sessioncontrol
import android.content.res.Resources import android.content.res.Resources
import android.graphics.Canvas import android.graphics.Canvas
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import androidx.core.content.ContextCompat import androidx.appcompat.content.res.AppCompatResources
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.mozilla.fenix.R import org.mozilla.fenix.R
@ -46,7 +46,7 @@ class SwipeToDeleteCallback(
isCurrentlyActive: Boolean isCurrentlyActive: Boolean
) { ) {
super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
val icon = ContextCompat.getDrawable(recyclerView.context, R.drawable.ic_delete) val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.ic_delete)
icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive)) icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive))
val backgroundDrawable = when { val backgroundDrawable = when {
@ -59,7 +59,7 @@ class SwipeToDeleteCallback(
else -> R.drawable.session_background else -> R.drawable.session_background
} }
val background = ContextCompat.getDrawable(recyclerView.context, backgroundDrawable) val background = AppCompatResources.getDrawable(recyclerView.context, backgroundDrawable)
background?.let { background?.let {
icon?.let { icon?.let {
val itemView = viewHolder.itemView val itemView = viewHolder.itemView

4
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
Unescape Escape View File

@ -7,7 +7,7 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders
import android.graphics.Outline import android.graphics.Outline
import android.view.View import android.view.View
import android.view.ViewOutlineProvider import android.view.ViewOutlineProvider
import androidx.core.content.ContextCompat import androidx.appcompat.content.res.AppCompatResources
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.extensions.LayoutContainer import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.tab_in_collection.* import kotlinx.android.synthetic.main.tab_in_collection.*
@ -74,7 +74,7 @@ class TabInCollectionViewHolder(
// If I'm the last one... // If I'm the last one...
if (isLastTab) { if (isLastTab) {
view.background = ContextCompat.getDrawable(view.context, R.drawable.rounded_bottom_corners) view.background = AppCompatResources.getDrawable(view.context, R.drawable.rounded_bottom_corners)
divider_line.visibility = View.GONE divider_line.visibility = View.GONE
} else { } else {
view.backgroundColor = view.context.getColorFromAttr(R.attr.above) view.backgroundColor = view.context.getColorFromAttr(R.attr.above)

3
app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
Unescape Escape View File

@ -10,6 +10,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout
@ -109,7 +110,7 @@ class ToolbarView(
) )
edit.setUrlBackground( edit.setUrlBackground(
ContextCompat.getDrawable(container.context, R.drawable.search_url_background)) AppCompatResources.getDrawable(container.context, R.drawable.search_url_background))
private = isPrivate private = isPrivate

6
app/src/main/res/layout/collection_home_list_row.xml
Unescape Escape View File

@ -24,7 +24,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_tab_collection" app:srcCompat="@drawable/ic_tab_collection"
android:tint="@null" android:tint="@null"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -83,7 +83,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/share_button_content_description" android:contentDescription="@string/share_button_content_description"
android:src="@drawable/ic_hollow_share" app:srcCompat="@drawable/ic_hollow_share"
app:layout_constraintBottom_toBottomOf="@id/collection_icon" app:layout_constraintBottom_toBottomOf="@id/collection_icon"
app:layout_constraintEnd_toStartOf="@id/collection_overflow_button" app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
app:layout_constraintTop_toTopOf="@id/collection_icon" /> app:layout_constraintTop_toTopOf="@id/collection_icon" />
@ -94,7 +94,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/collection_menu_button_content_description" android:contentDescription="@string/collection_menu_button_content_description"
android:src="@drawable/ic_menu" app:srcCompat="@drawable/ic_menu"
app:layout_constraintBottom_toBottomOf="@id/collection_icon" app:layout_constraintBottom_toBottomOf="@id/collection_icon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/collection_icon" /> app:layout_constraintTop_toTopOf="@id/collection_icon" />

2
app/src/main/res/layout/collections_list_item.xml
Unescape Escape View File

@ -28,7 +28,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_tab_collection" app:srcCompat="@drawable/ic_tab_collection"
android:tint="@null" android:tint="@null"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/component_collection_creation.xml
Unescape Escape View File

@ -16,7 +16,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:drawableStart="@drawable/mozac_ic_back" app:drawableStartCompat="@drawable/mozac_ic_back"
android:drawablePadding="8dp" android:drawablePadding="8dp"
app:drawableTint="@color/neutral_text" app:drawableTint="@color/neutral_text"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
@ -142,7 +142,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/create_collection_close" android:contentDescription="@string/create_collection_close"
android:src="@drawable/mozac_ic_close" app:srcCompat="@drawable/mozac_ic_close"
android:tint="?neutral" android:tint="?neutral"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/component_collection_creation_name_collection.xml
Unescape Escape View File

@ -16,7 +16,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:drawableStart="@drawable/mozac_ic_back" app:drawableStartCompat="@drawable/mozac_ic_back"
android:drawablePadding="8dp" android:drawablePadding="8dp"
app:drawableTint="@color/neutral_text" app:drawableTint="@color/neutral_text"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
@ -121,7 +121,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/create_collection_close" android:contentDescription="@string/create_collection_close"
android:src="@drawable/mozac_ic_close" app:srcCompat="@drawable/mozac_ic_close"
android:tint="?neutral" android:tint="?neutral"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/component_collection_creation_select_collection.xml
Unescape Escape View File

@ -16,7 +16,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:drawableStart="@drawable/mozac_ic_back" app:drawableStartCompat="@drawable/mozac_ic_back"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
app:drawableTint="@color/neutral_text" app:drawableTint="@color/neutral_text"
@ -124,7 +124,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_new" app:srcCompat="@drawable/ic_new"
android:tint="?neutral" android:tint="?neutral"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/exception_item.xml
Unescape Escape View File

@ -54,7 +54,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
android:contentDescription="@string/history_delete_item" android:contentDescription="@string/history_delete_item"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_about.xml
Unescape Escape View File

@ -20,7 +20,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="80dp" android:layout_height="80dp"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:src="?fenixLogo" app:srcCompat="?fenixLogo"
app:layout_constraintWidth_percent="0.75" app:layout_constraintWidth_percent="0.75"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_add_new_device.xml
Unescape Escape View File

@ -43,7 +43,7 @@
<TextView <TextView
android:id="@+id/errorSummary" android:id="@+id/errorSummary"
android:drawableStart="@drawable/ic_info" app:drawableStartCompat="@drawable/ic_info"
android:text="@string/sync_add_new_device_message" android:text="@string/sync_add_new_device_message"
android:drawablePadding="8dp" android:drawablePadding="8dp"
app:drawableTint="@color/sync_error_text_color" app:drawableTint="@color/sync_error_text_color"

2
app/src/main/res/layout/fragment_crash_reporter.xml
Unescape Escape View File

@ -15,7 +15,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="120dp" android:layout_height="120dp"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:src="@drawable/fenix_error_1" app:srcCompat="@drawable/fenix_error_1"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintWidth_percent="0.8" app:layout_constraintWidth_percent="0.8"

2
app/src/main/res/layout/fragment_edit_bookmark.xml
Unescape Escape View File

@ -80,7 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:drawableStart="@drawable/ic_folder_icon" app:drawableStartCompat="@drawable/ic_folder_icon"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:textColor="?secondaryText" android:textColor="?secondaryText"
android:textSize="16sp" android:textSize="16sp"

8
app/src/main/res/layout/fragment_home.xml
Unescape Escape View File

@ -24,7 +24,7 @@
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_private_browsing_button" android:contentDescription="@string/content_description_private_browsing_button"
android:src="@drawable/private_browsing_button" app:srcCompat="@drawable/private_browsing_button"
app:layout_constraintBottom_toTopOf="@+id/wordmark" app:layout_constraintBottom_toTopOf="@+id/wordmark"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -41,7 +41,7 @@
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:focusable="false" android:focusable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="?fenixLogo" app:srcCompat="?fenixLogo"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -120,7 +120,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/add_tab" android:contentDescription="@string/add_tab"
android:src="@drawable/ic_new" app:srcCompat="@drawable/ic_new"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/menuButton" app:layout_constraintEnd_toStartOf="@+id/menuButton"
app:layout_constraintStart_toEndOf="@id/toolbar_wrapper" app:layout_constraintStart_toEndOf="@id/toolbar_wrapper"
@ -132,7 +132,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_menu" android:contentDescription="@string/content_description_menu"
android:src="@drawable/ic_menu" app:srcCompat="@drawable/ic_menu"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toBottomOf="parent"/>

7
app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml
Unescape Escape View File

@ -4,7 +4,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -24,7 +25,7 @@
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:button="@null" android:button="@null"
android:drawableStart="?android:attr/listChoiceIndicatorSingle" app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
android:drawablePadding="@dimen/radio_button_preference_drawable_padding" android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
android:paddingTop="@dimen/radio_button_preference_vertical" android:paddingTop="@dimen/radio_button_preference_vertical"
android:paddingStart="@dimen/radio_button_preference_horizontal" android:paddingStart="@dimen/radio_button_preference_horizontal"
@ -39,7 +40,7 @@
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:button="@null" android:button="@null"
android:drawableStart="?android:attr/listChoiceIndicatorSingle" app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
android:drawablePadding="@dimen/radio_button_preference_drawable_padding" android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
android:paddingTop="@dimen/radio_button_preference_vertical" android:paddingTop="@dimen/radio_button_preference_vertical"
android:paddingStart="@dimen/radio_button_preference_horizontal" android:paddingStart="@dimen/radio_button_preference_horizontal"

6
app/src/main/res/layout/fragment_search.xml
Unescape Escape View File

@ -76,7 +76,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:tint="?primaryText" android:tint="?primaryText"
android:src="@drawable/ic_link" app:srcCompat="@drawable/ic_link"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@ -164,14 +164,14 @@
android:id="@+id/searchScanButton" android:id="@+id/searchScanButton"
style="@style/search_pill" style="@style/search_pill"
android:layout_marginEnd="@dimen/search_fragment_scan_button_margin_end" android:layout_marginEnd="@dimen/search_fragment_scan_button_margin_end"
android:drawableStart="@drawable/ic_qr" app:drawableStartCompat="@drawable/ic_qr"
android:textOff="@string/search_scan_button" android:textOff="@string/search_scan_button"
android:textOn="@string/search_scan_button" /> android:textOn="@string/search_scan_button" />
<ToggleButton <ToggleButton
android:id="@+id/searchShortcutsButton" android:id="@+id/searchShortcutsButton"
style="@style/search_pill" style="@style/search_pill"
android:drawableStart="@drawable/ic_search" app:drawableStartCompat="@drawable/ic_search"
android:textOff="@string/search_shortcuts_button" android:textOff="@string/search_shortcuts_button"
android:textOn="@string/search_shortcuts_button" /> android:textOn="@string/search_shortcuts_button" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/fragment_sign_out.xml
Unescape Escape View File

@ -15,7 +15,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:drawableStart="@drawable/ic_info" app:drawableStartCompat="@drawable/ic_info"
android:text="@string/sign_out_confirmation_message" android:text="@string/sign_out_confirmation_message"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

20
app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
Unescape Escape View File

@ -2,15 +2,15 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="@dimen/site_permissions_exceptions_item_height"
android:layout_height="@dimen/site_permissions_exceptions_item_height" xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="24dp" android:paddingStart="24dp"
android:paddingEnd="24dp"> android:paddingEnd="24dp">
<ImageView <ImageView
android:id="@+id/exception_icon" android:id="@+id/exception_icon"
@ -18,7 +18,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:drawableStart="@drawable/ic_internet"/> app:drawableStartCompat="@drawable/ic_internet"/>
<TextView <TextView
android:id="@+id/exception_text" android:id="@+id/exception_text"

4
app/src/main/res/layout/library_site_item.xml
Unescape Escape View File

@ -35,7 +35,7 @@
android:padding="10dp" android:padding="10dp"
android:background="@drawable/favicon_background" android:background="@drawable/favicon_background"
android:backgroundTint="?accentHighContrast" android:backgroundTint="?accentHighContrast"
android:src="@drawable/mozac_ic_check" /> app:srcCompat="@drawable/mozac_ic_check" />
</ImageSwitcher> </ImageSwitcher>
<TextView <TextView
@ -77,7 +77,7 @@
android:layout_height="@dimen/glyph_button_height" android:layout_height="@dimen/glyph_button_height"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_menu" android:contentDescription="@string/content_description_menu"
android:src="@drawable/ic_menu" app:srcCompat="@drawable/ic_menu"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>

3
app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
Unescape Escape View File

@ -4,6 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:background="@drawable/mozac_ui_tabcounter_round_rectangle_ripple" tools:background="@drawable/mozac_ui_tabcounter_round_rectangle_ripple"
tools:layout_height="wrap_content" tools:layout_height="wrap_content"
tools:layout_width="wrap_content"> tools:layout_width="wrap_content">
@ -20,7 +21,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_tabs"/> app:srcCompat="@drawable/ic_tabs"/>
<!-- This text size auto adjusts based on num digits in `TabCounter` --> <!-- This text size auto adjusts based on num digits in `TabCounter` -->
<TextView <TextView

2
app/src/main/res/layout/pbm_shortcut_popup.xml
Unescape Escape View File

@ -14,7 +14,7 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_gravity="end" android:layout_gravity="end"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_pbm_triangle" /> app:srcCompat="@drawable/ic_pbm_triangle" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/preference_search_add_engine.xml
Unescape Escape View File

@ -18,7 +18,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:textAlignment="textStart" android:textAlignment="textStart"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:src="@drawable/ic_new" app:srcCompat="@drawable/ic_new"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toBottomOf="parent"/>

2
app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
Unescape Escape View File

@ -69,7 +69,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="18dp" android:layout_marginStart="18dp"
android:layout_marginEnd="18dp" android:layout_marginEnd="18dp"
android:src="@drawable/ic_info" app:srcCompat="@drawable/ic_info"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/vertical_divider" app:layout_constraintStart_toEndOf="@+id/vertical_divider"

8
app/src/main/res/layout/quicksettings_permissions.xml
Unescape Escape View File

@ -28,7 +28,7 @@
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsText.Icon"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/quicksettings_item_height" android:layout_height="@dimen/quicksettings_item_height"
android:drawableStart="@drawable/ic_camera" app:drawableStartCompat="@drawable/ic_camera"
android:text="@string/preference_phone_feature_camera" android:text="@string/preference_phone_feature_camera"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/microphoneLabel" app:layout_constraintBottom_toTopOf="@id/microphoneLabel"
@ -53,7 +53,7 @@
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsText.Icon"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/quicksettings_item_height" android:layout_height="@dimen/quicksettings_item_height"
android:drawableStart="@drawable/ic_microphone" app:drawableStartCompat="@drawable/ic_microphone"
android:text="@string/preference_phone_feature_microphone" android:text="@string/preference_phone_feature_microphone"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/notificationLabel" app:layout_constraintBottom_toTopOf="@id/notificationLabel"
@ -78,7 +78,7 @@
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsText.Icon"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/quicksettings_item_height" android:layout_height="@dimen/quicksettings_item_height"
android:drawableStart="@drawable/ic_notifications" app:drawableStartCompat="@drawable/ic_notifications"
android:text="@string/preference_phone_feature_notification" android:text="@string/preference_phone_feature_notification"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/locationLabel" app:layout_constraintBottom_toTopOf="@id/locationLabel"
@ -103,7 +103,7 @@
style="@style/QuickSettingsText.Icon" style="@style/QuickSettingsText.Icon"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/quicksettings_item_height" android:layout_height="@dimen/quicksettings_item_height"
android:drawableStart="@drawable/ic_location" app:drawableStartCompat="@drawable/ic_location"
android:text="@string/preference_phone_feature_location" android:text="@string/preference_phone_feature_location"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/search_engine_radio_button.xml
Unescape Escape View File

@ -46,7 +46,7 @@
android:layout_height="@dimen/glyph_button_height" android:layout_height="@dimen/glyph_button_height"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_menu" android:contentDescription="@string/content_description_menu"
android:src="@drawable/ic_menu" app:srcCompat="@drawable/ic_menu"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>

4
app/src/main/res/layout/search_suggestions_onboarding.xml
Unescape Escape View File

@ -15,7 +15,7 @@
android:id="@+id/info_button" android:id="@+id/info_button"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_info" app:srcCompat="@drawable/ic_info"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:tint="@color/contrast_text_private_theme"/> tools:tint="@color/contrast_text_private_theme"/>
@ -82,4 +82,4 @@
app:layout_constraintEnd_toStartOf="@id/allow" app:layout_constraintEnd_toStartOf="@id/allow"
app:layout_constraintTop_toTopOf="@id/allow" /> app:layout_constraintTop_toTopOf="@id/allow" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/switch_with_description.xml
Unescape Escape View File

@ -47,7 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal" android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal" android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
android:drawableStart="@drawable/ic_tracking_protection" app:drawableStartCompat="@drawable/ic_tracking_protection"
app:layout_constraintBottom_toBottomOf="@id/switchItemDescription" app:layout_constraintBottom_toBottomOf="@id/switchItemDescription"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/switchItemTitle" /> app:layout_constraintTop_toTopOf="@id/switchItemTitle" />

6
app/src/main/res/layout/tab_header.xml
Unescape Escape View File

@ -27,7 +27,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/tabs_menu_share_tabs" android:contentDescription="@string/tabs_menu_share_tabs"
android:src="@drawable/ic_hollow_share" app:srcCompat="@drawable/ic_hollow_share"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/close_tabs_button" app:layout_constraintEnd_toStartOf="@+id/close_tabs_button"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -38,7 +38,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/tabs_menu_close_all_tabs" android:contentDescription="@string/tabs_menu_close_all_tabs"
android:src="@drawable/ic_delete" app:srcCompat="@drawable/ic_delete"
android:tint="?primaryText" android:tint="?primaryText"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tabs_overflow_button" app:layout_constraintEnd_toStartOf="@+id/tabs_overflow_button"
@ -50,7 +50,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/open_tabs_menu" android:contentDescription="@string/open_tabs_menu"
android:src="@drawable/ic_menu" app:srcCompat="@drawable/ic_menu"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/tab_in_collection.xml
Unescape Escape View File

@ -23,7 +23,7 @@
android:layout_marginTop="23dp" android:layout_marginTop="23dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_tab_collection" app:srcCompat="@drawable/ic_tab_collection"
android:tint="@null" android:tint="@null"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -64,7 +64,7 @@
android:alpha="0.8" android:alpha="0.8"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/close_tab" android:contentDescription="@string/close_tab"
android:src="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

4
app/src/main/res/layout/tab_list_row.xml
Unescape Escape View File

@ -42,7 +42,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:elevation="10dp" android:elevation="10dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/pause_with_background" app:srcCompat="@drawable/pause_with_background"
android:visibility="gone" android:visibility="gone"
app:layout_constraintCircleAngle="45" app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="28dp" app:layout_constraintCircleRadius="28dp"
@ -83,7 +83,7 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:alpha="0.8" android:alpha="0.8"
android:src="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>

4
app/src/main/res/layout/tracking_protection_onboarding_popup.xml
Unescape Escape View File

@ -23,7 +23,7 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:src="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
android:tint="@color/primary_text_dark_theme" android:tint="@color/primary_text_dark_theme"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -51,6 +51,6 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:rotation="180" android:rotation="180"
android:src="@drawable/ic_triangle" app:srcCompat="@drawable/ic_triangle"
android:layout_gravity="start" /> android:layout_gravity="start" />
</LinearLayout> </LinearLayout>

Write Preview
Loading…
Cancel
Save