blallo
/
fenix
1
0
Fork 0
Code Releases Activity

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.
master
Leonardo Murça 2020-07-20 22:20:29 -03:00 committed by Jeff Boek
parent 6aa70977e7
commit 0c8c87e56d
12 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/component_collection_creation_select_collection.xml
View File

@ -88,7 +88,7 @@
android:fadingEdgeLength="30dp"
android:requiresFadingEdge="vertical"
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_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/back_button"

2
app/src/main/res/layout/custom_search_engine.xml
View File

@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:text="@string/search_add_custom_engine_search_string_example"
android:lineHeight="18sp"
android:labelFor="@+id/edit_search_string"
android:labelFor="@id/edit_search_string"
android:textColor="@android:color/tertiary_text_dark" />
<org.mozilla.fenix.utils.LinkTextView

2
app/src/main/res/layout/fragment_add_on_permissions.xml
View File

@ -21,7 +21,7 @@
android:id="@+id/learn_more_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/add_ons_permissions"
android:layout_below="@id/add_ons_permissions"
android:background="?attr/selectableItemBackground"
android:padding="16dp"
android:paddingStart="16dp"

10
app/src/main/res/layout/fragment_installed_add_on_details.xml
View File

@ -39,7 +39,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_below="@+id/enable_switch"
android:layout_below="@id/enable_switch"
android:background="?android:attr/selectableItemBackground"
android:checked="false"
android:clickable="true"
@ -56,7 +56,7 @@
android:id="@+id/settings"
android:layout_width="match_parent"
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:drawablePadding="32dp"
android:padding="16dp"
@ -70,7 +70,7 @@
android:id="@+id/details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings"
android:layout_below="@id/settings"
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="32dp"
android:padding="16dp"
@ -84,7 +84,7 @@
android:id="@+id/permissions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/details"
android:layout_below="@id/details"
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="32dp"
android:padding="16dp"
@ -97,7 +97,7 @@
android:id="@+id/remove_add_on"
style="@style/DestructiveButton"
android:layout_marginHorizontal="16dp"
android:layout_below="@+id/permissions"
android:layout_below="@id/permissions"
android:text="@string/mozac_feature_addons_remove" />
</RelativeLayout>
</ScrollView>

2
app/src/main/res/layout/fragment_search.xml
View File

@ -62,7 +62,7 @@
android:id="@+id/search_suggestions_onboarding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inflatedId="@+id/search_suggestions_onboarding"
android:inflatedId="@id/search_suggestions_onboarding"
android:layout="@layout/search_suggestions_onboarding"
app:layout_constraintBottom_toTopOf="@id/awesomeBar_barrier"
app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/layout/fragment_sign_out.xml
View File

@ -27,8 +27,8 @@
style="@style/SitePermissionCancelButton"
android:text="@string/sign_out_cancel"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/signOutDisconnect"
app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
app:layout_constraintEnd_toStartOf="@id/signOutDisconnect"
app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
<com.google.android.material.button.MaterialButton
android:id="@+id/signOutDisconnect"
@ -36,5 +36,5 @@
android:text="@string/sign_out_disconnect"
app:layout_constraintBottom_toBottomOf="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>

8
app/src/main/res/layout/locale_settings_item.xml
View File

@ -31,9 +31,9 @@
android:textAlignment="viewStart"
app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
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_constraintStart_toEndOf="@+id/locale_selected_icon"
app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="English (United States)" />
@ -51,8 +51,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
app:layout_constraintTop_toBottomOf="@+id/locale_title_text"
app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
app:layout_constraintTop_toBottomOf="@id/locale_title_text"
app:layout_constraintVertical_chainStyle="packed"
tools:text="English (United States)" />

4
app/src/main/res/layout/logins_item.xml
View File

@ -46,7 +46,7 @@
android:textColor="?primaryText"
app:layout_constraintBottom_toTopOf="@id/usernameView"
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_constraintVertical_chainStyle="packed"
tools:text="mozilla.org" />
@ -62,7 +62,7 @@
android:textColor="?secondaryText"
app:layout_constraintBottom_toBottomOf="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_constraintVertical_chainStyle="packed"
tools:text="mozilla.org" />

2
app/src/main/res/layout/onboarding_tracking_protection.xml
View File

@ -90,4 +90,4 @@
app:onboardingKeyDescription="@string/onboarding_tracking_protection_strict_button_description_2"
app:onboardingKeyTitle="@string/onboarding_tracking_protection_strict_option"
tools:text="Strict" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/preference_widget_radiobutton.xml
View File

@ -38,7 +38,7 @@
android:textAppearance="?android:attr/textAppearanceListItem"
app:layout_constraintTop_toTopOf="@id/radio_button"
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"/>
<TextView

4
app/src/main/res/layout/switch_with_description.xml
View File

@ -20,7 +20,7 @@
android:importantForAccessibility="no"
android:textAppearance="@style/ListItemTextStyle"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/trackingProtectionCategoryItemDescription"
app:layout_constraintBottom_toTopOf="@id/trackingProtectionCategoryItemDescription"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
@ -41,7 +41,7 @@
app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@id/trackingProtectionCategoryTitle"
app:layout_constraintTop_toBottomOf="@+id/trackingProtectionCategoryTitle"
app:layout_constraintTop_toBottomOf="@id/trackingProtectionCategoryTitle"
app:layout_constraintVertical_chainStyle="packed"
tools:text="@tools:sample/lorem" />

6
app/src/main/res/navigation/nav_graph.xml
View File

@ -7,7 +7,7 @@
<action
android:id="@+id/action_global_home"
app:destination="@+id/homeFragment"
app:destination="@id/homeFragment"
app:popUpTo="@id/homeFragment"
app:popUpToInclusive="true" />
@ -56,7 +56,7 @@
app:destination="@id/settingsFragment" />
<action
android:id="@+id/action_global_syncedTabsFragment"
app:destination="@+id/syncedTabsFragment" />
app:destination="@id/syncedTabsFragment" />
<action
android:id="@+id/action_global_privateBrowsingFragment"
app:destination="@id/privateBrowsingFragment" />
@ -392,7 +392,7 @@
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
app:popUpTo="@+id/settingsFragment" />
app:popUpTo="@id/settingsFragment" />
<action
android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
app:destination="@id/sitePermissionsFragment"