Bug 1379066 - 4. Readermode icon use new resource
In Photon, the reader-mode icon should support private mode. Therefore
we rename resource in Australis to *ic_readermode* for consistent.
MozReview-Commit-ID: 1ejwk3OfUex
rename from mobile/android/app/src/main/res/drawable-hdpi/reader.png
rename to mobile/android/app/src/australis/res/drawable-hdpi/ic_readermode.png
rename from mobile/android/app/src/main/res/drawable-hdpi/reader_active.png
rename to mobile/android/app/src/australis/res/drawable-hdpi/ic_readermode_on.png
rename from mobile/android/app/src/main/res/drawable-xhdpi/reader.png
rename to mobile/android/app/src/australis/res/drawable-xhdpi/ic_readermode.png
rename from mobile/android/app/src/main/res/drawable-xhdpi/reader_active.png
rename to mobile/android/app/src/australis/res/drawable-xhdpi/ic_readermode_on.png
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/drawable/ic_readermode.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- private browsing mode -->
+ <item android:drawable="@drawable/ic_readermode_pm" gecko:state_private="true" />
+
+ <!-- normal mode -->
+ <item android:drawable="@drawable/ic_readermode_nm" />
+
+</selector>
--- a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
+++ b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
@@ -39,22 +39,22 @@ final class UnusedResourcesUtil {
R.drawable.alert_download,
R.drawable.alert_download_animation,
R.drawable.alert_mic,
R.drawable.alert_mic_camera,
R.drawable.casting,
R.drawable.casting_active,
R.drawable.close,
R.drawable.homepage_banner_firstrun,
+ R.drawable.ic_readermode,
+ R.drawable.ic_readermode_on,
R.drawable.icon_openinapp,
R.drawable.pause,
R.drawable.phone,
R.drawable.play,
- R.drawable.reader,
- R.drawable.reader_active,
R.drawable.sync_promo,
R.drawable.undo_button_icon,
};
public static final int[] USED_IN_MANIFEST = {
R.drawable.search_launcher,
R.string.crash_reporter_title,
R.xml.fxaccount_authenticator,
--- a/mobile/android/chrome/content/Reader.js
+++ b/mobile/android/chrome/content/Reader.js
@@ -174,31 +174,31 @@ var Reader = {
title: title,
clickCallback: () => this.pageAction.readerModeCallback(browser),
important: true
});
};
let browser = tab.browser;
if (browser.currentURI.spec.startsWith("about:reader")) {
- showPageAction("drawable://reader_active", Strings.reader.GetStringFromName("readerView.close"));
+ showPageAction("drawable://ic_readermode_on", Strings.reader.GetStringFromName("readerView.close"));
// Only start a reader session if the viewer is in the foreground. We do
// not track background reader viewers.
UITelemetry.startSession("reader.1", null);
return;
}
// not in ReaderMode, to make sure System UI is visible, not dimmed.
this._showSystemUI(true);
// Only stop a reader session if the foreground viewer is not visible.
UITelemetry.stopSession("reader.1", "", null);
if (browser.isArticle) {
- showPageAction("drawable://reader", Strings.reader.GetStringFromName("readerView.enter"));
+ showPageAction("drawable://ic_readermode", Strings.reader.GetStringFromName("readerView.enter"));
UITelemetry.addEvent("show.1", "button", null, "reader_available");
this._sendMmaEvent("reader_available");
} else {
UITelemetry.addEvent("show.1", "button", null, "reader_unavailable");
}
},
_sendMmaEvent: function(event) {