jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380537 )
Change subject: Consolidation: Abolish window_background_color attribute. ...................................................................... Consolidation: Abolish window_background_color attribute. Also clean up a couple of things along the way. Change-Id: I6d721569e1b22bf6c2053f872b558c61b03da7d4 --- M app/src/main/java/org/wikipedia/offline/DiskUsageView.java M app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java M app/src/main/res/layout/activity_about.xml M app/src/main/res/layout/activity_create_account.xml M app/src/main/res/layout/activity_edit_section.xml M app/src/main/res/layout/activity_langlinks.xml M app/src/main/res/layout/activity_license.xml M app/src/main/res/layout/activity_login.xml M app/src/main/res/layout/activity_single_fragment.xml M app/src/main/res/layout/activity_single_fragment_with_toolbar.xml M app/src/main/res/layout/dialog_preference_languages.xml M app/src/main/res/layout/fragment_compilation_detail.xml M app/src/main/res/layout/fragment_description_edit.xml M app/src/main/res/layout/fragment_history.xml M app/src/main/res/layout/fragment_local_compilations.xml M app/src/main/res/layout/fragment_news.xml M app/src/main/res/layout/fragment_page_bottom_content.xml M app/src/main/res/layout/fragment_preview_edit.xml M app/src/main/res/layout/fragment_preview_summary.xml M app/src/main/res/layout/fragment_reading_list.xml M app/src/main/res/layout/fragment_reading_lists.xml M app/src/main/res/layout/fragment_remote_compilations.xml M app/src/main/res/layout/fragment_search_recent.xml M app/src/main/res/layout/fragment_search_results.xml M app/src/main/res/layout/group_captcha.xml M app/src/main/res/layout/view_description_edit_help.xml M app/src/main/res/layout/view_disk_usage.xml M app/src/main/res/layout/view_explore_overflow.xml M app/src/main/res/layout/view_search_empty.xml M app/src/main/res/values/attrs.xml M app/src/main/res/values/styles_dark.xml M app/src/main/res/values/styles_light.xml 32 files changed, 32 insertions(+), 48 deletions(-) Approvals: jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java index 1c32063..d88cac0 100644 --- a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java +++ b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java @@ -78,7 +78,7 @@ usageAppText.setText(R.string.app_name); setDotTint(otherDot, R.attr.primary_text_color); setDotTint(usedDot, R.attr.colorAccent); - setDotTint(freeDot, R.attr.window_background_color); + setDotTint(freeDot, android.R.attr.windowBackground); update(0); } diff --git a/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java b/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java index 54695aa..4e586f5 100644 --- a/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java +++ b/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java @@ -28,7 +28,7 @@ deleteBackgroundPaint.setStyle(Paint.Style.FILL); deleteBackgroundPaint.setColor(Color.RED); itemBackgroundPaint.setStyle(Paint.Style.FILL); - itemBackgroundPaint.setColor(ResourceUtil.getThemedColor(context, R.attr.window_background_color)); + itemBackgroundPaint.setColor(ResourceUtil.getThemedColor(context, android.R.attr.windowBackground)); deleteIcon = ResourceUtil.bitmapFromVectorDrawable(context, R.drawable.ic_delete_white_24dp); } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 1d24cd4..d7c03b2 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -6,9 +6,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/about_scrollview" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/window_background_color" - > + android:layout_height="match_parent"> <LinearLayout android:id="@+id/about_container" android:orientation="vertical" diff --git a/app/src/main/res/layout/activity_create_account.xml b/app/src/main/res/layout/activity_create_account.xml index 280e385..3f947b6 100644 --- a/app/src/main/res/layout/activity_create_account.xml +++ b/app/src/main/res/layout/activity_create_account.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:layout_height="match_parent"> <ScrollView android:layout_width="match_parent" @@ -124,7 +123,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" android:orientation="vertical" android:visibility="gone"/> </FrameLayout> diff --git a/app/src/main/res/layout/activity_edit_section.xml b/app/src/main/res/layout/activity_edit_section.xml index 618e2ed..10c9f5d 100644 --- a/app/src/main/res/layout/activity_edit_section.xml +++ b/app/src/main/res/layout/activity_edit_section.xml @@ -5,8 +5,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:layout_height="match_parent"> <ProgressBar android:id="@+id/edit_section_load_progress" @@ -63,7 +62,7 @@ android:id="@+id/edit_section_abusefilter_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" android:visibility="gone" tools:visibility="visible"> <LinearLayout @@ -105,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@color/base80" + android:background="?android:windowBackground" android:orientation="vertical" android:visibility="gone"/> </FrameLayout> diff --git a/app/src/main/res/layout/activity_langlinks.xml b/app/src/main/res/layout/activity_langlinks.xml index befc697..9ad6253 100644 --- a/app/src/main/res/layout/activity_langlinks.xml +++ b/app/src/main/res/layout/activity_langlinks.xml @@ -3,8 +3,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:layout_height="match_parent"> <ProgressBar android:id="@+id/langlinks_load_progress" diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index b40a6cc..5781bda 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -3,8 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:background="?attr/window_background_color"> + android:orientation="vertical"> <TextView android:id="@+id/license_text" diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index ce1ec44..a15320c 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:layout_height="match_parent"> <ScrollView android:layout_width="match_parent" @@ -151,7 +150,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" android:orientation="vertical" android:visibility="gone"/> </FrameLayout> diff --git a/app/src/main/res/layout/activity_single_fragment.xml b/app/src/main/res/layout/activity_single_fragment.xml index 2a6694a..aa609c5 100644 --- a/app/src/main/res/layout/activity_single_fragment.xml +++ b/app/src/main/res/layout/activity_single_fragment.xml @@ -5,5 +5,4 @@ android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color" tools:context=".activity.SingleFragmentActivity" /> diff --git a/app/src/main/res/layout/activity_single_fragment_with_toolbar.xml b/app/src/main/res/layout/activity_single_fragment_with_toolbar.xml index 8103593..8d97fa8 100644 --- a/app/src/main/res/layout/activity_single_fragment_with_toolbar.xml +++ b/app/src/main/res/layout/activity_single_fragment_with_toolbar.xml @@ -5,7 +5,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color" tools:context=".activity.SingleFragmentToolbarActivity"> <FrameLayout diff --git a/app/src/main/res/layout/dialog_preference_languages.xml b/app/src/main/res/layout/dialog_preference_languages.xml index ed0bfd8..9a8cdeb 100644 --- a/app/src/main/res/layout/dialog_preference_languages.xml +++ b/app/src/main/res/layout/dialog_preference_languages.xml @@ -4,7 +4,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:background="?android:windowBackground"> <android.support.design.widget.TextInputLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_compilation_detail.xml b/app/src/main/res/layout/fragment_compilation_detail.xml index 9c4c630..5ec8d7e 100644 --- a/app/src/main/res/layout/fragment_compilation_detail.xml +++ b/app/src/main/res/layout/fragment_compilation_detail.xml @@ -28,7 +28,7 @@ android:id="@+id/compilation_detail_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" app:layout_collapseMode="parallax" android:fitsSystemWindows="true"> diff --git a/app/src/main/res/layout/fragment_description_edit.xml b/app/src/main/res/layout/fragment_description_edit.xml index be17dc0..701e475 100644 --- a/app/src/main/res/layout/fragment_description_edit.xml +++ b/app/src/main/res/layout/fragment_description_edit.xml @@ -3,5 +3,4 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/fragment_description_edit_view" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/window_background_color"/> \ No newline at end of file + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index ed23513..21dc587 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -55,6 +55,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" - android:background="?attr/window_background_color"/> + android:background="?android:windowBackground"/> </FrameLayout> diff --git a/app/src/main/res/layout/fragment_local_compilations.xml b/app/src/main/res/layout/fragment_local_compilations.xml index 2cadfdc..52b83ea 100644 --- a/app/src/main/res/layout/fragment_local_compilations.xml +++ b/app/src/main/res/layout/fragment_local_compilations.xml @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" - android:orientation="vertical"> + app:cardBackgroundColor="?android:windowBackground"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_news.xml b/app/src/main/res/layout/fragment_news.xml index 9693a51..3f35ec1 100644 --- a/app/src/main/res/layout/fragment_news.xml +++ b/app/src/main/res/layout/fragment_news.xml @@ -4,7 +4,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color" android:fitsSystemWindows="true"> <android.support.design.widget.AppBarLayout diff --git a/app/src/main/res/layout/fragment_page_bottom_content.xml b/app/src/main/res/layout/fragment_page_bottom_content.xml index 2100283..4896856 100644 --- a/app/src/main/res/layout/fragment_page_bottom_content.xml +++ b/app/src/main/res/layout/fragment_page_bottom_content.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingBottom="16dp" - android:background="?attr/window_background_color"> + android:background="?android:windowBackground"> <View android:layout_width="match_parent" android:layout_height="8dp" diff --git a/app/src/main/res/layout/fragment_preview_edit.xml b/app/src/main/res/layout/fragment_preview_edit.xml index 6e2af26..e5f82cd 100644 --- a/app/src/main/res/layout/fragment_preview_edit.xml +++ b/app/src/main/res/layout/fragment_preview_edit.xml @@ -9,7 +9,7 @@ android:layout_height="match_parent" android:visibility="gone" tools:visibility="visible" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" > <LinearLayout diff --git a/app/src/main/res/layout/fragment_preview_summary.xml b/app/src/main/res/layout/fragment_preview_summary.xml index d5ec923..13621af 100644 --- a/app/src/main/res/layout/fragment_preview_summary.xml +++ b/app/src/main/res/layout/fragment_preview_summary.xml @@ -9,7 +9,7 @@ android:padding="8dp" android:visibility="gone" tools:visibility="visible" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" > <android.support.design.widget.TextInputLayout diff --git a/app/src/main/res/layout/fragment_reading_list.xml b/app/src/main/res/layout/fragment_reading_list.xml index 0dfaf92..8452931 100644 --- a/app/src/main/res/layout/fragment_reading_list.xml +++ b/app/src/main/res/layout/fragment_reading_list.xml @@ -52,7 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="vertical" - android:background="?attr/window_background_color"/> + android:background="?android:windowBackground"/> <TextView android:id="@+id/reading_list_empty_text" diff --git a/app/src/main/res/layout/fragment_reading_lists.xml b/app/src/main/res/layout/fragment_reading_lists.xml index db82548..e8fe4dd 100644 --- a/app/src/main/res/layout/fragment_reading_lists.xml +++ b/app/src/main/res/layout/fragment_reading_lists.xml @@ -67,7 +67,7 @@ android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/window_background_color" /> + android:background="?android:windowBackground" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_remote_compilations.xml b/app/src/main/res/layout/fragment_remote_compilations.xml index 39c697c..eaabe60 100644 --- a/app/src/main/res/layout/fragment_remote_compilations.xml +++ b/app/src/main/res/layout/fragment_remote_compilations.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:background="?attr/base_color"> <android.support.design.widget.AppBarLayout android:id="@+id/compilation_list_app_bar" @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="vertical" - android:background="?attr/window_background_color"/> + android:background="?android:windowBackground"/> <ProgressBar android:id="@+id/compilation_list_progress" diff --git a/app/src/main/res/layout/fragment_search_recent.xml b/app/src/main/res/layout/fragment_search_recent.xml index a2d3e73..2812b9a 100644 --- a/app/src/main/res/layout/fragment_search_recent.xml +++ b/app/src/main/res/layout/fragment_search_recent.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color" + android:background="?attr/base_color" android:id="@+id/recent_searches_container"> <LinearLayout @@ -40,7 +40,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" android:orientation="vertical" android:id="@+id/recent_searches"> diff --git a/app/src/main/res/layout/fragment_search_results.xml b/app/src/main/res/layout/fragment_search_results.xml index aaa0098..a5ef334 100644 --- a/app/src/main/res/layout/fragment_search_results.xml +++ b/app/src/main/res/layout/fragment_search_results.xml @@ -14,7 +14,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background_color"> + android:background="?android:windowBackground"> <TextView android:id="@+id/search_suggestion" diff --git a/app/src/main/res/layout/group_captcha.xml b/app/src/main/res/layout/group_captcha.xml index 6a94fb9..6b8e08d 100644 --- a/app/src/main/res/layout/group_captcha.xml +++ b/app/src/main/res/layout/group_captcha.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:background="?attr/window_background_color" + android:background="?android:windowBackground" android:orientation="vertical" android:padding="16dp" android:visibility="gone" diff --git a/app/src/main/res/layout/view_description_edit_help.xml b/app/src/main/res/layout/view_description_edit_help.xml index 46bc7f7..a7fe139 100644 --- a/app/src/main/res/layout/view_description_edit_help.xml +++ b/app/src/main/res/layout/view_description_edit_help.xml @@ -7,8 +7,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:background="?attr/window_background_color"> + android:paddingRight="@dimen/activity_horizontal_margin"> <TextView android:id="@+id/view_description_edit_help_contents" diff --git a/app/src/main/res/layout/view_disk_usage.xml b/app/src/main/res/layout/view_disk_usage.xml index cb79013..ac5479b 100644 --- a/app/src/main/res/layout/view_disk_usage.xml +++ b/app/src/main/res/layout/view_disk_usage.xml @@ -70,7 +70,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="3" - android:background="?attr/window_background_color"/> + android:background="?android:windowBackground"/> </LinearLayout> @@ -139,7 +139,7 @@ android:background="@drawable/shape_circle" android:src="@drawable/shape_circle_outline" android:contentDescription="@null" - tools:backgroundTint="?attr/window_background_color" /> + tools:backgroundTint="?android:windowBackground" /> <TextView android:id="@+id/view_disk_usage_text_free" diff --git a/app/src/main/res/layout/view_explore_overflow.xml b/app/src/main/res/layout/view_explore_overflow.xml index 679afa8..6dec5af 100644 --- a/app/src/main/res/layout/view_explore_overflow.xml +++ b/app/src/main/res/layout/view_explore_overflow.xml @@ -43,7 +43,7 @@ android:orientation="vertical" android:paddingTop="8dp" android:paddingBottom="8dp" - android:background="?attr/window_background_color"> + android:background="?android:windowBackground"> <TextView android:id="@+id/explore_overflow_compilations" diff --git a/app/src/main/res/layout/view_search_empty.xml b/app/src/main/res/layout/view_search_empty.xml index 80b90ff..d1969c3 100644 --- a/app/src/main/res/layout/view_search_empty.xml +++ b/app/src/main/res/layout/view_search_empty.xml @@ -13,7 +13,6 @@ app:srcCompat="@drawable/ic_search_white_24dp" android:tint="@color/base30" android:background="@drawable/shape_circle" - tools:backgroundTint="?attr/window_background_color" android:contentDescription="@null" /> <TextView diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 8291d83..9982e95 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="window_background_color" format="reference"/> <attr name="main_toolbar_color" format="reference"/> <attr name="main_status_bar_color" format="reference"/> <attr name="toc_item_background" format="reference"/> diff --git a/app/src/main/res/values/styles_dark.xml b/app/src/main/res/values/styles_dark.xml index 17d187a..9aa1439 100644 --- a/app/src/main/res/values/styles_dark.xml +++ b/app/src/main/res/values/styles_dark.xml @@ -30,7 +30,6 @@ <item name="blue_switch">@style/BlueSwitchDark</item> <!-- Overrides of our own custom color attributes --> - <item name="window_background_color">@color/base10</item> <item name="main_toolbar_color">@color/accent30</item> <item name="main_status_bar_color">@color/accent20</item> <item name="edit_text_color">@color/base90</item> diff --git a/app/src/main/res/values/styles_light.xml b/app/src/main/res/values/styles_light.xml index 565a845..58d9da6 100644 --- a/app/src/main/res/values/styles_light.xml +++ b/app/src/main/res/values/styles_light.xml @@ -30,7 +30,6 @@ <item name="blue_switch">@style/BlueSwitchLight</item> <!-- Overrides of our own custom color attributes --> - <item name="window_background_color">@color/base90</item> <item name="main_toolbar_color">@color/accent50</item> <item name="main_status_bar_color">@color/accent30</item> <item name="edit_text_color">@color/base0</item> -- To view, visit https://gerrit.wikimedia.org/r/380537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d721569e1b22bf6c2053f872b558c61b03da7d4 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Cooltey <cf...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits