mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-09 19:10:42 +00:00
For #12755 - Replace @+id by @id when referencing already declared ids
When referencing an Android resource ID, you do not need the plus-symbol if you declared before. Caution: make sure that the resource you are referring to is defined EARLIER and not LATER.
This commit is contained in:
parent
6aa70977e7
commit
0c8c87e56d
@ -88,7 +88,7 @@
|
|||||||
android:fadingEdgeLength="30dp"
|
android:fadingEdgeLength="30dp"
|
||||||
android:requiresFadingEdge="vertical"
|
android:requiresFadingEdge="vertical"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/bottom_button_bar_layout"
|
app:layout_constraintBottom_toTopOf="@id/bottom_button_bar_layout"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/back_button"
|
app:layout_constraintTop_toBottomOf="@id/back_button"
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/search_add_custom_engine_search_string_example"
|
android:text="@string/search_add_custom_engine_search_string_example"
|
||||||
android:lineHeight="18sp"
|
android:lineHeight="18sp"
|
||||||
android:labelFor="@+id/edit_search_string"
|
android:labelFor="@id/edit_search_string"
|
||||||
android:textColor="@android:color/tertiary_text_dark" />
|
android:textColor="@android:color/tertiary_text_dark" />
|
||||||
|
|
||||||
<org.mozilla.fenix.utils.LinkTextView
|
<org.mozilla.fenix.utils.LinkTextView
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
android:id="@+id/learn_more_label"
|
android:id="@+id/learn_more_label"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/add_ons_permissions"
|
android:layout_below="@id/add_ons_permissions"
|
||||||
android:background="?attr/selectableItemBackground"
|
android:background="?attr/selectableItemBackground"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
android:paddingStart="16dp"
|
android:paddingStart="16dp"
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical|end"
|
android:layout_gravity="center_vertical|end"
|
||||||
android:layout_below="@+id/enable_switch"
|
android:layout_below="@id/enable_switch"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:checked="false"
|
android:checked="false"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
@ -56,7 +56,7 @@
|
|||||||
android:id="@+id/settings"
|
android:id="@+id/settings"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/allow_in_private_browsing_switch"
|
android:layout_below="@id/allow_in_private_browsing_switch"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:drawablePadding="32dp"
|
android:drawablePadding="32dp"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
@ -70,7 +70,7 @@
|
|||||||
android:id="@+id/details"
|
android:id="@+id/details"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/settings"
|
android:layout_below="@id/settings"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:drawablePadding="32dp"
|
android:drawablePadding="32dp"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
@ -84,7 +84,7 @@
|
|||||||
android:id="@+id/permissions"
|
android:id="@+id/permissions"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/details"
|
android:layout_below="@id/details"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:drawablePadding="32dp"
|
android:drawablePadding="32dp"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
@ -97,7 +97,7 @@
|
|||||||
android:id="@+id/remove_add_on"
|
android:id="@+id/remove_add_on"
|
||||||
style="@style/DestructiveButton"
|
style="@style/DestructiveButton"
|
||||||
android:layout_marginHorizontal="16dp"
|
android:layout_marginHorizontal="16dp"
|
||||||
android:layout_below="@+id/permissions"
|
android:layout_below="@id/permissions"
|
||||||
android:text="@string/mozac_feature_addons_remove" />
|
android:text="@string/mozac_feature_addons_remove" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
android:id="@+id/search_suggestions_onboarding"
|
android:id="@+id/search_suggestions_onboarding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:inflatedId="@+id/search_suggestions_onboarding"
|
android:inflatedId="@id/search_suggestions_onboarding"
|
||||||
android:layout="@layout/search_suggestions_onboarding"
|
android:layout="@layout/search_suggestions_onboarding"
|
||||||
app:layout_constraintBottom_toTopOf="@id/awesomeBar_barrier"
|
app:layout_constraintBottom_toTopOf="@id/awesomeBar_barrier"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
@ -27,8 +27,8 @@
|
|||||||
style="@style/SitePermissionCancelButton"
|
style="@style/SitePermissionCancelButton"
|
||||||
android:text="@string/sign_out_cancel"
|
android:text="@string/sign_out_cancel"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/signOutDisconnect"
|
app:layout_constraintEnd_toStartOf="@id/signOutDisconnect"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
|
app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/signOutDisconnect"
|
android:id="@+id/signOutDisconnect"
|
||||||
@ -36,5 +36,5 @@
|
|||||||
android:text="@string/sign_out_disconnect"
|
android:text="@string/sign_out_disconnect"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
|
app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
@ -31,9 +31,9 @@
|
|||||||
android:textAlignment="viewStart"
|
android:textAlignment="viewStart"
|
||||||
app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
|
app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
|
||||||
android:textSize="@dimen/locale_item_title_size"
|
android:textSize="@dimen/locale_item_title_size"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/locale_subtitle_text"
|
app:layout_constraintBottom_toTopOf="@id/locale_subtitle_text"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
|
app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="English (United States)" />
|
tools:text="English (United States)" />
|
||||||
@ -51,8 +51,8 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
|
app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
|
||||||
app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
|
app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/locale_title_text"
|
app:layout_constraintTop_toBottomOf="@id/locale_title_text"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="English (United States)" />
|
tools:text="English (United States)" />
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
android:textColor="?primaryText"
|
android:textColor="?primaryText"
|
||||||
app:layout_constraintBottom_toTopOf="@id/usernameView"
|
app:layout_constraintBottom_toTopOf="@id/usernameView"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
|
app:layout_constraintStart_toEndOf="@id/favicon_wrapper"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="mozilla.org" />
|
tools:text="mozilla.org" />
|
||||||
@ -62,7 +62,7 @@
|
|||||||
android:textColor="?secondaryText"
|
android:textColor="?secondaryText"
|
||||||
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/favicon_wrapper"
|
app:layout_constraintStart_toEndOf="@id/favicon_wrapper"
|
||||||
app:layout_constraintTop_toBottomOf="@id/webAddressView"
|
app:layout_constraintTop_toBottomOf="@id/webAddressView"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="mozilla.org" />
|
tools:text="mozilla.org" />
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||||
app:layout_constraintTop_toTopOf="@id/radio_button"
|
app:layout_constraintTop_toTopOf="@id/radio_button"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/radio_button"
|
app:layout_constraintStart_toEndOf="@id/radio_button"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/radio_button"/>
|
app:layout_constraintBottom_toBottomOf="@id/radio_button"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:textAppearance="@style/ListItemTextStyle"
|
android:textAppearance="@style/ListItemTextStyle"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/trackingProtectionCategoryItemDescription"
|
app:layout_constraintBottom_toTopOf="@id/trackingProtectionCategoryItemDescription"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0"
|
app:layout_constraintHorizontal_bias="0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@ -41,7 +41,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle"
|
app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
app:layout_constraintStart_toStartOf="@id/trackingProtectionCategoryTitle"
|
app:layout_constraintStart_toStartOf="@id/trackingProtectionCategoryTitle"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/trackingProtectionCategoryTitle"
|
app:layout_constraintTop_toBottomOf="@id/trackingProtectionCategoryTitle"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="@tools:sample/lorem" />
|
tools:text="@tools:sample/lorem" />
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_home"
|
android:id="@+id/action_global_home"
|
||||||
app:destination="@+id/homeFragment"
|
app:destination="@id/homeFragment"
|
||||||
app:popUpTo="@id/homeFragment"
|
app:popUpTo="@id/homeFragment"
|
||||||
app:popUpToInclusive="true" />
|
app:popUpToInclusive="true" />
|
||||||
|
|
||||||
@ -56,7 +56,7 @@
|
|||||||
app:destination="@id/settingsFragment" />
|
app:destination="@id/settingsFragment" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_syncedTabsFragment"
|
android:id="@+id/action_global_syncedTabsFragment"
|
||||||
app:destination="@+id/syncedTabsFragment" />
|
app:destination="@id/syncedTabsFragment" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_privateBrowsingFragment"
|
android:id="@+id/action_global_privateBrowsingFragment"
|
||||||
app:destination="@id/privateBrowsingFragment" />
|
app:destination="@id/privateBrowsingFragment" />
|
||||||
@ -392,7 +392,7 @@
|
|||||||
app:exitAnim="@anim/slide_out_left"
|
app:exitAnim="@anim/slide_out_left"
|
||||||
app:popEnterAnim="@anim/slide_in_left"
|
app:popEnterAnim="@anim/slide_in_left"
|
||||||
app:popExitAnim="@anim/slide_out_right"
|
app:popExitAnim="@anim/slide_out_right"
|
||||||
app:popUpTo="@+id/settingsFragment" />
|
app:popUpTo="@id/settingsFragment" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
|
android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
|
||||||
app:destination="@id/sitePermissionsFragment"
|
app:destination="@id/sitePermissionsFragment"
|
||||||
|
Loading…
Reference in New Issue
Block a user