Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169267
Change subject: Fix dismissability of ToC tutorial on certain screens.
......................................................................
Fix dismissability of ToC tutorial on certain screens.
Bug: 72595
Change-Id: Ifafa853247e461550226d0a8b06275fe58be13de
---
M wikipedia/res/layout/group_toc_intro.xml
D wikipedia/res/values-h480dp/dimens.xml
M wikipedia/res/values/dimens.xml
3 files changed, 4 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/67/169267/1
diff --git a/wikipedia/res/layout/group_toc_intro.xml
b/wikipedia/res/layout/group_toc_intro.xml
index 4a1c0d5..b8e1af9 100644
--- a/wikipedia/res/layout/group_toc_intro.xml
+++ b/wikipedia/res/layout/group_toc_intro.xml
@@ -25,10 +25,10 @@
/>
<ImageView
- android:layout_width="@dimen/toc_intro_image_size"
- android:layout_height="@dimen/toc_intro_image_size"
- android:layout_marginBottom="@dimen/toc_intro_image_marginBottom"
- android:layout_marginTop="@dimen/toc_intro_image_marginTop"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ android:layout_marginTop="8dp"
android:contentDescription="@null"
android:src="@drawable/swipe_left"/>
diff --git a/wikipedia/res/values-h480dp/dimens.xml
b/wikipedia/res/values-h480dp/dimens.xml
deleted file mode 100644
index 901e9bc..0000000
--- a/wikipedia/res/values-h480dp/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!--
- ToC Intro
- -->
- <dimen name="toc_intro_image_size">@dimen/wrap_content</dimen>
- <dimen name="toc_intro_image_marginTop">16dp</dimen>
- <dimen name="toc_intro_image_marginBottom">48dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/wikipedia/res/values/dimens.xml b/wikipedia/res/values/dimens.xml
index 72b807f..68445c0 100644
--- a/wikipedia/res/values/dimens.xml
+++ b/wikipedia/res/values/dimens.xml
@@ -1,9 +1,5 @@
<resources>
- <!-- trick to be able to use match_parent and wrap_content in dimen
resources -->
- <dimen name="match_parent">-1dp</dimen>
- <dimen name="wrap_content">-2dp</dimen>
-
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
@@ -30,12 +26,5 @@
-->
<dimen name="onboarding_wp_logo_text">26dp</dimen>
<dimen name="onboarding_wp_logo_subtext">13dp</dimen>
-
- <!--
- ToC Intro
- -->
- <dimen name="toc_intro_image_size">48dp</dimen>
- <dimen name="toc_intro_image_marginTop">8dp</dimen>
- <dimen name="toc_intro_image_marginBottom">8dp</dimen>
</resources>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/169267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifafa853247e461550226d0a8b06275fe58be13de
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
