[MediaWiki-commits] [Gerrit] Hygiene: consolidate queries for display density to a single... - change (apps...wikipedia)

2016-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: consolidate queries for display density to a single 
source.
..


Hygiene: consolidate queries for display density to a single source.

This also consolidates queries for display width and height.

Change-Id: Ie3804727b4617492b594472eec62ae4f97889787
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
M app/src/main/java/org/wikipedia/util/DimenUtil.java
M app/src/main/java/org/wikipedia/views/ObservableWebView.java
M app/src/main/java/org/wikipedia/views/ViewUtil.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
17 files changed, 45 insertions(+), 62 deletions(-)

Approvals:
  Niedzielski: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index f971116..3b6ee03 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -3,7 +3,6 @@
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Application;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -68,11 +67,6 @@
 
 public class WikipediaApp extends Application {
 private static final int EVENT_LOG_TESTING_ID = new 
Random().nextInt(Integer.MAX_VALUE);
-
-private float screenDensity;
-public float getScreenDensity() {
-return screenDensity;
-}
 
 public static final int FONT_SIZE_MULTIPLIER_MIN = -5;
 public static final int FONT_SIZE_MULTIPLIER_MAX = 8;
@@ -166,9 +160,7 @@
 Fresco.initialize(this);
 bus = new Bus();
 
-final Resources resources = getResources();
-ViewAnimations.init(resources);
-screenDensity = resources.getDisplayMetrics().density;
+ViewAnimations.init(getResources());
 currentTheme = unmarshalCurrentTheme();
 
 appLanguageState = new AppLanguageState(this);
diff --git a/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
index a986285..41152f5 100644
--- a/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
@@ -4,12 +4,12 @@
 
 import org.json.JSONObject;
 import org.wikipedia.WikipediaApp;
+import org.wikipedia.util.DimenUtil;
 
 public class PageScrollFunnel extends TimedFunnel {
 private static final String SCHEMA_NAME = "MobileWikiAppPageScroll";
 private static final int REV_ID = 14591606;
 
-private final WikipediaApp app;
 private final int pageId;
 private int viewportHeight;
 private int pageHeight;
@@ -19,7 +19,6 @@
 
 public PageScrollFunnel(WikipediaApp app, int pageId) {
 super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ? 
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
-this.app = app;
 this.pageId = pageId;
 }
 
@@ -37,7 +36,7 @@
 }
 
 public void setPageHeight(int height) {
-this.pageHeight = (int) (height * app.getScreenDensity());
+this.pageHeight = (int) (height * DimenUtil.getDensityScalar());
 }
 
 public void setViewportHeight(int height) {
@@ -47,9 +46,9 @@
 public void logDone() {
 log(
 "pageID", pageId,
-"pageHeight", (int) (pageHeight / app.getScreenDensity()),
-"scrollFluxDown", (int) (scrollFluxDown / 
app.getScreenDensity()),
-"scrollFluxUp", (int) (scrollFluxUp / app.getScreenDensity()),
+"pageHeight", (int) (pageHeight / 
DimenUtil.getDensityScalar()),
+"scrollFluxDown", (int) (scrollFluxDown / 
DimenUtil.getDensityScalar()),
+"scrollFluxUp", (int) (scrollFluxUp / 
DimenUtil.getDensityScalar()),
 "maxPercentViewed", getMaxPercentViewed()
 );
 }
diff --git a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java

[MediaWiki-commits] [Gerrit] Hygiene: consolidate queries for display density to a single... - change (apps...wikipedia)

2016-03-14 Thread Dbrant (Code Review) 
Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/277310

Change subject: Hygiene: consolidate queries for display density to a single 
source.
..

Hygiene: consolidate queries for display density to a single source.

This also consolidates queries for display width and height.

Change-Id: Ie3804727b4617492b594472eec62ae4f97889787
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/ToCHandler.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
M app/src/main/java/org/wikipedia/util/DimenUtil.java
M app/src/main/java/org/wikipedia/views/ObservableWebView.java
M app/src/main/java/org/wikipedia/views/ViewUtil.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
17 files changed, 52 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/10/277310/1

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index f971116..3b6ee03 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -3,7 +3,6 @@
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Application;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -68,11 +67,6 @@
 
 public class WikipediaApp extends Application {
 private static final int EVENT_LOG_TESTING_ID = new 
Random().nextInt(Integer.MAX_VALUE);
-
-private float screenDensity;
-public float getScreenDensity() {
-return screenDensity;
-}
 
 public static final int FONT_SIZE_MULTIPLIER_MIN = -5;
 public static final int FONT_SIZE_MULTIPLIER_MAX = 8;
@@ -166,9 +160,7 @@
 Fresco.initialize(this);
 bus = new Bus();
 
-final Resources resources = getResources();
-ViewAnimations.init(resources);
-screenDensity = resources.getDisplayMetrics().density;
+ViewAnimations.init(getResources());
 currentTheme = unmarshalCurrentTheme();
 
 appLanguageState = new AppLanguageState(this);
diff --git a/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
index a986285..41152f5 100644
--- a/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/PageScrollFunnel.java
@@ -4,12 +4,12 @@
 
 import org.json.JSONObject;
 import org.wikipedia.WikipediaApp;
+import org.wikipedia.util.DimenUtil;
 
 public class PageScrollFunnel extends TimedFunnel {
 private static final String SCHEMA_NAME = "MobileWikiAppPageScroll";
 private static final int REV_ID = 14591606;
 
-private final WikipediaApp app;
 private final int pageId;
 private int viewportHeight;
 private int pageHeight;
@@ -19,7 +19,6 @@
 
 public PageScrollFunnel(WikipediaApp app, int pageId) {
 super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ? 
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
-this.app = app;
 this.pageId = pageId;
 }
 
@@ -37,7 +36,7 @@
 }
 
 public void setPageHeight(int height) {
-this.pageHeight = (int) (height * app.getScreenDensity());
+this.pageHeight = (int) (height * DimenUtil.getDensityScalar());
 }
 
 public void setViewportHeight(int height) {
@@ -47,9 +46,9 @@
 public void logDone() {
 log(
 "pageID", pageId,
-"pageHeight", (int) (pageHeight / app.getScreenDensity()),
-"scrollFluxDown", (int) (scrollFluxDown / 
app.getScreenDensity()),
-"scrollFluxUp", (int) (scrollFluxUp / app.getScreenDensity()),
+"pageHeight", (int) (pageHeight / 
DimenUtil.getDensityScalar()),
+"scrollFluxDown", (int) (scrollFluxDown / 
DimenUtil.getDensityScalar()),
+"scrollFluxUp", (int) (scrollFluxUp / 
DimenUtil.getDensityScalar()),
 "maxPercentViewed", getMaxPercentViewed()
 );
 }
diff --git