For #24252 - Rename disabled attribute to textDisabled
This commit is contained in:
parent
4263e1fd62
commit
a59d319eb0
|
@ -85,7 +85,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
|||
|
||||
if (resources.getBoolean(R.bool.tablet)) {
|
||||
val enableTint = ThemeManager.resolveAttribute(R.attr.textPrimary, context)
|
||||
val disableTint = ThemeManager.resolveAttribute(R.attr.disabled, context)
|
||||
val disableTint = ThemeManager.resolveAttribute(R.attr.textDisabled, context)
|
||||
val backAction = BrowserToolbar.TwoStateButton(
|
||||
primaryImage = AppCompatResources.getDrawable(
|
||||
context,
|
||||
|
|
|
@ -99,7 +99,7 @@ open class DefaultToolbarMenu(
|
|||
isInPrimaryState = {
|
||||
selectedSession?.content?.canGoBack ?: true
|
||||
},
|
||||
secondaryImageTintResource = ThemeManager.resolveAttribute(R.attr.disabled, context),
|
||||
secondaryImageTintResource = ThemeManager.resolveAttribute(R.attr.textDisabled, context),
|
||||
disableInSecondaryState = true,
|
||||
longClickListener = { onItemTapped.invoke(ToolbarMenu.Item.Back(viewHistory = true)) }
|
||||
) {
|
||||
|
@ -113,7 +113,7 @@ open class DefaultToolbarMenu(
|
|||
isInPrimaryState = {
|
||||
selectedSession?.content?.canGoForward ?: true
|
||||
},
|
||||
secondaryImageTintResource = ThemeManager.resolveAttribute(R.attr.disabled, context),
|
||||
secondaryImageTintResource = ThemeManager.resolveAttribute(R.attr.textDisabled, context),
|
||||
disableInSecondaryState = true,
|
||||
longClickListener = { onItemTapped.invoke(ToolbarMenu.Item.Forward(viewHistory = true)) }
|
||||
) {
|
||||
|
|
|
@ -60,7 +60,7 @@ class CustomTabToolbarMenu(
|
|||
session?.content?.canGoBack ?: true
|
||||
},
|
||||
secondaryImageTintResource = ThemeManager.resolveAttribute(
|
||||
R.attr.disabled,
|
||||
R.attr.textDisabled,
|
||||
context
|
||||
),
|
||||
disableInSecondaryState = true,
|
||||
|
@ -77,7 +77,7 @@ class CustomTabToolbarMenu(
|
|||
session?.content?.canGoForward ?: true
|
||||
},
|
||||
secondaryImageTintResource = ThemeManager.resolveAttribute(
|
||||
R.attr.disabled,
|
||||
R.attr.textDisabled,
|
||||
context
|
||||
),
|
||||
disableInSecondaryState = true,
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
- 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/. -->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="?disabled" />
|
||||
<item android:state_enabled="false" android:color="?attr/textDisabled" />
|
||||
<item android:color="?attr/textPrimary"/>
|
||||
</selector>
|
||||
|
|
|
@ -4,5 +4,5 @@
|
|||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="true" android:color="?attr/textPrimary"/>
|
||||
<item android:state_enabled="false" android:color="?disabled" />
|
||||
<item android:state_enabled="false" android:color="?attr/textDisabled" />
|
||||
</selector>
|
||||
|
|
|
@ -6,5 +6,5 @@
|
|||
<item android:state_enabled="true"
|
||||
android:color="?attr/textPrimary" />
|
||||
<item android:state_enabled="false"
|
||||
android:color="?disabled" />
|
||||
android:color="?attr/textDisabled" />
|
||||
</selector>
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
- 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/. -->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="?disabled" />
|
||||
<item android:state_enabled="false" android:color="?attr/textDisabled" />
|
||||
<item android:color="?attr/textSecondary"/>
|
||||
</selector>
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
- 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/. -->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="?disabled" />
|
||||
<item android:state_enabled="false" android:color="?attr/textDisabled" />
|
||||
<item android:color="?attr/textPrimary"/>
|
||||
</selector>
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
android:textSize="16sp"
|
||||
android:fontFamily="sans-serif"
|
||||
android:textStyle="normal"
|
||||
android:textColor="?disabled"
|
||||
android:textColor="?attr/textDisabled"
|
||||
android:letterSpacing="0.01"
|
||||
android:lineSpacingExtra="8sp"
|
||||
android:hint="@string/saved_login_hostname_description"
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
<attr name="textPrimary" format="reference" />
|
||||
<!-- Secondary text -->
|
||||
<attr name="textSecondary" format="reference" />
|
||||
<!-- Disabled text -->
|
||||
<attr name="textDisabled" format="reference" />
|
||||
<!-- Small heading, Text link -->
|
||||
<attr name="textAccent" format="reference" />
|
||||
<!-- Action Primary text -->
|
||||
|
@ -52,7 +54,6 @@
|
|||
<attr name="neutral" format="reference" />
|
||||
<attr name="neutralFaded" format="reference" />
|
||||
<attr name="destructive" format="reference"/>
|
||||
<attr name="disabled" format="reference" />
|
||||
<attr name="preferenceSectionHeader" format="reference"/>
|
||||
|
||||
<!-- Color used in DefaultToolbarMenu for buttons placed at the end of menu items -->
|
||||
|
|
|
@ -53,6 +53,8 @@
|
|||
<item name="textPrimary">@color/fx_mobile_text_color_primary</item>
|
||||
<!-- Secondary text -->
|
||||
<item name="textSecondary">@color/fx_mobile_text_color_secondary</item>
|
||||
<!-- Disabled text -->
|
||||
<item name="textDisabled">@color/fx_mobile_text_color_disabled</item>
|
||||
<!-- Small heading, Text link -->
|
||||
<item name="textAccent">@color/fx_mobile_text_color_accent</item>
|
||||
<!-- Action Primary text -->
|
||||
|
@ -87,7 +89,6 @@
|
|||
<item name="neutral">@color/neutral_normal_theme</item>
|
||||
<item name="neutralFaded">@color/neutral_faded_normal_theme</item>
|
||||
<item name="destructive">@color/fx_mobile_text_color_warning</item>
|
||||
<item name="disabled">@color/fx_mobile_text_color_disabled</item>
|
||||
<item name="accentUsedOnDarkBackground">@color/fx_mobile_text_color_accent</item>
|
||||
<item name="toolbarStartGradient">@color/fx_mobile_layer_color_1</item>
|
||||
<item name="toolbarCenterGradient">@color/fx_mobile_layer_color_1</item>
|
||||
|
@ -247,6 +248,8 @@
|
|||
<item name="textPrimary">@color/fx_mobile_private_text_color_primary</item>
|
||||
<!-- Secondary text -->
|
||||
<item name="textSecondary">@color/fx_mobile_private_text_color_secondary</item>
|
||||
<!-- Disabled text -->
|
||||
<item name="textDisabled">@color/fx_mobile_private_text_color_disabled</item>
|
||||
<!-- Small heading, Text link -->
|
||||
<item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
|
||||
<!-- Action Primary text -->
|
||||
|
@ -279,7 +282,6 @@
|
|||
<item name="neutral">@color/neutral_private_theme</item>
|
||||
<item name="neutralFaded">@color/neutral_faded_private_theme</item>
|
||||
<item name="destructive">@color/fx_mobile_private_text_color_warning</item>
|
||||
<item name="disabled">@color/fx_mobile_private_text_color_disabled</item>
|
||||
<item name="accentUsedOnDarkBackground">@color/accent_high_contrast_private_theme</item>
|
||||
<item name="toolbarStartGradient">@color/fx_mobile_private_layer_color_4_start</item>
|
||||
<item name="toolbarCenterGradient">@color/fx_mobile_private_layer_color_4_center</item>
|
||||
|
|
Loading…
Reference in New Issue