Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226023
Change subject: Remove experimental page load checkbox from theme chooser.
......................................................................
Remove experimental page load checkbox from theme chooser.
...since it's now part of Developer Settings.
Change-Id: I94d5117c6bd7451ae37246c854a7001a44119dce
---
M wikipedia/res/layout/dialog_themechooser.xml
D wikipedia/res/layout/experimental_page_load.xml
D wikipedia/src/alpha/res/layout/experimental_page_load.xml
D wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
M wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
5 files changed, 0 insertions(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/23/226023/1
diff --git a/wikipedia/res/layout/dialog_themechooser.xml
b/wikipedia/res/layout/dialog_themechooser.xml
index bf67178..838ae61 100644
--- a/wikipedia/res/layout/dialog_themechooser.xml
+++ b/wikipedia/res/layout/dialog_themechooser.xml
@@ -111,14 +111,6 @@
/>
</LinearLayout>
- <!-- TODO: remove once we are done with this experiment -->
- <!--<include layout="@layout/experimental_page_load_switch"-->
- <include layout="@layout/experimental_page_load"
- android:id="@+id/experimental_page_load"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"/>
-
</LinearLayout>
<ProgressBar
diff --git a/wikipedia/res/layout/experimental_page_load.xml
b/wikipedia/res/layout/experimental_page_load.xml
deleted file mode 100644
index 876e8af..0000000
--- a/wikipedia/res/layout/experimental_page_load.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Fake layout to make compiler happy. Note visibility = gone. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
- xmlns:tools="http://schemas.android.com/tools";
-
- android:visibility="gone"
-
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/nav_background"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="26dp">
-
- <CheckBox
- android:id="@+id/use_exp_page_load_cb"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/white"
- android:text="Use experimental appservice (HTML) page loader"
- tools:ignore="HardcodedText" />
-</LinearLayout>
\ No newline at end of file
diff --git a/wikipedia/src/alpha/res/layout/experimental_page_load.xml
b/wikipedia/src/alpha/res/layout/experimental_page_load.xml
deleted file mode 100644
index c1a0873..0000000
--- a/wikipedia/src/alpha/res/layout/experimental_page_load.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
- xmlns:tools="http://schemas.android.com/tools";
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/nav_background"
- android:paddingBottom="16dp">
-
- <CheckBox
- android:id="@+id/use_exp_page_load_cb"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/white"
- android:text="Use experimental page loader"
- tools:ignore="HardcodedText" />
-</LinearLayout>
\ No newline at end of file
diff --git
a/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
b/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
deleted file mode 100644
index fce929a..0000000
---
a/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wikipedia.theme;
-
-import org.wikipedia.R;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.events.ThemeChangeEvent;
-import org.wikipedia.settings.Prefs;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-
-/**
- * Temp class, which enables turning on the page load experiment. Remove once
it is completed.
- */
-public final class ExperimentalPageLoadChooser {
- public static void initExperimentalPageLoadChooser(final Context context,
View root) {
- LinearLayout layout = (LinearLayout)
root.findViewById(R.id.experimental_page_load);
- CheckBox expPageLoadCB = (CheckBox)
layout.findViewById(R.id.use_exp_page_load_cb);
- expPageLoadCB.setChecked(Prefs.isExperimentalPageLoadEnabled());
- expPageLoadCB.setOnCheckedChangeListener(new
CompoundButton.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean
isChecked) {
- Prefs.setExperimentalPageLoadEnabled(isChecked);
- WikipediaApp.getInstance().getBus().post(new
ThemeChangeEvent());
- // Not ideal since it doesn't automatically reload the page
- // but good enough for experimental switching.
- // (The old strategy has a backstack, the new one doesn't.)
- // A page refresh right after this will crash the app.
- // Better use load a new page instead (Today, Random, search,
...)
- }
- });
- }
-
- // do not instantiate
- private ExperimentalPageLoadChooser() {
- }
-}
diff --git
a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index bef03a8..dc520c1 100644
--- a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -76,10 +76,6 @@
fontChangeProgressBar = (ProgressBar)
getDialogLayout().findViewById(R.id.font_change_progress_bar);
updateButtonState();
-
- if (app.isPreBetaRelease()) {
-
ExperimentalPageLoadChooser.initExperimentalPageLoadChooser(context,
getDialogLayout());
- }
}
@Subscribe
--
To view, visit https://gerrit.wikimedia.org/r/226023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94d5117c6bd7451ae37246c854a7001a44119dce
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
