From 1e2a2d77169b5de968e29873e13a78a0d8c94a18 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 8 Aug 2017 16:28:38 -0700
Subject: Misc (#128)

* Update null

* Attempt to improve transparent theme backgrounds

* Update menu

* Move injections to visible method and reduce offset

* Update searchview and logging

* Clean temp strings and add network states

* Move console blacklist to web state

* Change some logs to info
---
 app/src/main/res/values/strings_pref_networks.xml      | 4 ++++
 app/src/main/res/values/strings_pref_notifications.xml | 1 -
 app/src/main/res/values/strings_preferences.xml        | 3 +++
 app/src/main/res/values/strings_temp.xml               | 6 ------
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/values/strings_pref_networks.xml
 delete mode 100644 app/src/main/res/values/strings_temp.xml

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings_pref_networks.xml b/app/src/main/res/values/strings_pref_networks.xml
new file mode 100644
index 00000000..29eca24a
--- /dev/null
+++ b/app/src/main/res/values/strings_pref_networks.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="network_media_on_metered">Load images on metered network.</string>
+    <string name="network_media_on_metered_desc">If a metered network is detected, Frost will automatically stop all images and videos from loading.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml
index 00c30b57..3cd953f6 100644
--- a/app/src/main/res/values/strings_pref_notifications.xml
+++ b/app/src/main/res/values/strings_pref_notifications.xml
@@ -19,5 +19,4 @@
     <string name="notification_vibrate">Notification vibration</string>
     <string name="notification_lights">Notification lights</string>
 
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index c2ba0b36..3cacf684 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -10,6 +10,9 @@
     <string name="behaviour">Behaviour</string>
     <string name="behaviour_desc">Define how the app interacts in certain settings</string>
 
+    <string name="network">Network</string>
+    <string name="network_desc">Define options that affect metered networks</string>
+
     <string name="experimental">Experimental</string>
     <string name="experimental_desc">Enable early access to potentially unstable features</string>
 
diff --git a/app/src/main/res/values/strings_temp.xml b/app/src/main/res/values/strings_temp.xml
deleted file mode 100644
index 526b102d..00000000
--- a/app/src/main/res/values/strings_temp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="intro_title">Frost now has an intro screen</string>
-    <string name="intro_desc">Would you like to see it? You can always replay it under settings</string>
-
-</resources>
\ No newline at end of file
-- 
cgit v1.2.3