jenkins-bot has submitted this change and it was merged.

Change subject: Upgrade Android Support libraries to v23.4.0
......................................................................


Upgrade Android Support libraries to v23.4.0

Notes on the upgrade[0,1].

You may have to build twice initially to download the new library
dependencies. I think it's this bug[2] in the SDK Manager plugin.

[0] http://developer.android.com/tools/support-library/index.html#rev23-4-0
[1] 
https://medium.com/@chrisbanes/appcompat-v23-2-age-of-the-vectors-91cbafa87c88
[2] https://github.com/JakeWharton/sdk-manager-plugin/issues/101

Change-Id: I2c966a3066b9ceb873eec4bfa7053664e95f9fca
---
M app/build.gradle
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/res/layout/dialog_add_to_reading_list.xml
3 files changed, 19 insertions(+), 2 deletions(-)

Approvals:
  BearND: Looks good to me, but someone else must approve
  Mholloway: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/build.gradle b/app/build.gradle
index 0043898..6b7a586 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -158,7 +158,7 @@
 
     String retrofitVersion = '2.0.2'
     String okHttpVersion = '3.2.0'
-    String supportVersion = '23.3.0'
+    String supportVersion = '23.4.0'
     String espressoVersion = '2.2.2'
     String butterKnifeVersion = '8.0.1'
     String frescoVersion = '0.10.0'
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index d8cfc91..137c6bf 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -10,6 +10,7 @@
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatDelegate;
 import android.view.Window;
 import android.webkit.WebView;
 
@@ -163,6 +164,9 @@
         super.onCreate();
         initExceptionHandling();
 
+        // See Javadocs and 
http://developer.android.com/tools/support-library/index.html#rev23-4-0
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+
         Fresco.initialize(this);
         bus = new Bus();
 
diff --git a/app/src/main/res/layout/dialog_add_to_reading_list.xml 
b/app/src/main/res/layout/dialog_add_to_reading_list.xml
index d5d72e1..5850611 100644
--- a/app/src/main/res/layout/dialog_add_to_reading_list.xml
+++ b/app/src/main/res/layout/dialog_add_to_reading_list.xml
@@ -126,7 +126,20 @@
 
         <!--
         Not yet able to use vector drawables with compound TextView...
-        https://code.google.com/p/android/issues/detail?id=204183
+        https://code.google.com/p/android/issues/detail?id=204183. Here's what 
it might look like
+        (currently doesn't work on at least API 16 and 19):
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:gravity="center_vertical"
+                android:textSize="16sp"
+                android:textColor="?attr/link_preview_text_color"
+                android:text="@string/reading_lists_onboarding_example1"
+                android:drawablePadding="24dp"
+                android:drawableLeft="@drawable/ic_grid_gray_24dp"
+                android:drawableStart="@drawable/ic_grid_gray_24dp" />
         -->
         <LinearLayout
             android:layout_width="match_parent"

-- 
To view, visit https://gerrit.wikimedia.org/r/288698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c966a3066b9ceb873eec4bfa7053664e95f9fca
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to