jenkins-bot has submitted this change and it was merged.
Change subject: Don't show progress bar on top of ToC onboarding.
......................................................................
Don't show progress bar on top of ToC onboarding.
Rearranged the layout so that the onboarding view covers the progress bar
opaquely.
Bug: T76932
Change-Id: Ia08da38cf4da692c433a31f0220df9c6fe8e442a
---
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/layout/group_toc_intro.xml
2 files changed, 13 insertions(+), 11 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index aa472a1..b340ee9 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -155,7 +155,18 @@
<FrameLayout
android:layout_width="288dp"
android:layout_height="match_parent"
- android:layout_gravity="end">
+ android:layout_gravity="end"
+ android:background="?attr/toc_background_color"
+ >
+
+ <ProgressBar
+ android:id="@+id/page_toc_in_progress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:progressBarStyleLarge"
+ android:indeterminate="true"
+ android:layout_gravity="center"
+ />
<LinearLayout
android:layout_width="match_parent"
@@ -172,14 +183,12 @@
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
- android:background="?attr/toc_background_color"
>
<ListView
android:id="@+id/page_toc_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
- android:background="?attr/toc_background_color"
android:visibility="gone"
android:choiceMode="singleChoice"
/>
@@ -192,14 +201,6 @@
</LinearLayout>
- <ProgressBar
- android:id="@+id/page_toc_in_progress"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="?android:progressBarStyleLarge"
- android:indeterminate="true"
- android:layout_gravity="center"
- />
</FrameLayout>
</org.wikipedia.views.DisableableDrawerLayout>
<LinearLayout
diff --git a/wikipedia/res/layout/group_toc_intro.xml
b/wikipedia/res/layout/group_toc_intro.xml
index 8e20e84..75108b1 100644
--- a/wikipedia/res/layout/group_toc_intro.xml
+++ b/wikipedia/res/layout/group_toc_intro.xml
@@ -10,6 +10,7 @@
android:orientation="vertical"
android:paddingLeft="32dp"
android:paddingRight="32dp"
+ android:background="?attr/toc_background_color"
>
<TextView
--
To view, visit https://gerrit.wikimedia.org/r/183618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia08da38cf4da692c433a31f0220df9c6fe8e442a
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
