Added hardware acceleration toggle in the preferences.

thecowan · Oct 19, 2019 · 8d28aa9 · 8d28aa9
1 parent 4ee62a3
commit 8d28aa9
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 4 deletions.
diff --git a/WallPanelApp/build.gradle b/WallPanelApp/build.gradle
@@ -23,8 +23,8 @@ apply plugin: 'com.google.gms.google-services'
 
 def versionMajor = 0
 def versionMinor = 8
-def versionPatch = 8
-def versionBuild = 9 // bump for dog food builds, public betas, etc.
+def versionPatch = 9
+def versionBuild = 0 // bump for dog food builds, public betas, etc.
 
 android {
     kapt {

diff --git a/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/persistence/Configuration.kt b/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/persistence/Configuration.kt
@@ -201,6 +201,10 @@ constructor(private val context: Context, private val sharedPreferences: SharedP
         get() = getBoolPref(R.string.key_setting_sensors_enabled,
                 R.string.default_setting_sensors_value)
 
+    val hardwareAccelerated: Boolean
+        get() = getBoolPref(R.string.key_hadware_accelerated_enabled,
+                R.string.default_hardware_accelerated_value)
+
     val browserUserAgent: String
         get() = getStringPref(R.string.key_setting_browser_user_agent,
                 R.string.default_browser_user_agent)

diff --git a/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/BrowserActivity.kt b/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/BrowserActivity.kt
@@ -114,7 +114,7 @@ abstract class BrowserActivity : DaggerAppCompatActivity() {
 
         decorView = window.decorView
 
-        if(Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
+        if(configuration.hardwareAccelerated && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
             window.setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)
         }
         Timber.d("Prevent Sleep ${configuration.appPreventSleep}")

diff --git a/...PanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/LiveCameraActivity.kt b/...PanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/activities/LiveCameraActivity.kt
@@ -75,7 +75,7 @@ class LiveCameraActivity : DaggerAppCompatActivity() {
             supportActionBar!!.title = getString(R.string.title_camera_test)
         }
 
-        if(Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
+        if(configuration.hardwareAccelerated && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
             window.setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)
         }
         preview = findViewById<CameraSourcePreview>(R.id.imageView_preview)

diff --git a/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/fragments/SettingsFragment.kt b/WallPanelApp/src/main/java/com/thanksmister/iot/wallpanel/ui/fragments/SettingsFragment.kt
@@ -53,6 +53,7 @@ class SettingsFragment : BaseSettingsFragment() {
     lateinit var screenUtils: ScreenUtils
 
     private var openOnBootPreference: SwitchPreference? = null
+    private var hadwareAcceleration: SwitchPreference? = null
     private var preventSleepPreference: SwitchPreference? = null
     private var browserActivityPreference: SwitchPreference? = null
 
@@ -149,6 +150,7 @@ class SettingsFragment : BaseSettingsFragment() {
         preventSleepPreference = findPreference(getString(R.string.key_setting_app_preventsleep)) as SwitchPreference
         browserActivityPreference = findPreference(getString(R.string.key_setting_app_showactivity)) as SwitchPreference
         openOnBootPreference = findPreference(getString(R.string.key_setting_android_startonboot)) as SwitchPreference
+        hadwareAcceleration = findPreference(getString(R.string.key_hadware_accelerated_enabled)) as SwitchPreference
         browserRefreshPreference = findPreference(getString(R.string.key_pref_browser_refresh)) as SwitchPreference
         clockSaverPreference = findPreference(getString(R.string.key_screensaver)) as SwitchPreference
         inactivityPreference = findPreference(PREF_SCREEN_INACTIVITY_TIME) as ListPreference
@@ -159,6 +161,7 @@ class SettingsFragment : BaseSettingsFragment() {
         bindPreferenceSummaryToValue(preventSleepPreference!!)
         bindPreferenceSummaryToValue(browserActivityPreference!!)
         bindPreferenceSummaryToValue(openOnBootPreference!!)
+        bindPreferenceSummaryToValue(hadwareAcceleration!!)
         bindPreferenceSummaryToValue(browserHeaderPreference!!)
         bindPreferenceSummaryToValue(clockSaverPreference!!)
 

diff --git a/WallPanelApp/src/main/res/values/donottranslate.xml b/WallPanelApp/src/main/res/values/donottranslate.xml
@@ -34,7 +34,9 @@
     <string name="key_settings_sensors_pressure">setting_sensors_pressure</string>
     <string name="key_settings_sensors_humidity">setting_sensors_humidity</string>
     <string name="key_setting_sensors_enabled">setting_sensors_enabled</string>
+    <string name="key_hadware_accelerated_enabled">hadware_accelerated_enabled</string>
     <string name="default_setting_sensors_value">false</string>
+    <string name="default_hardware_accelerated_value">true</string>
     <string name="key_setting_mqtt_basetopic">setting_mqtt_basetopic</string>
     <string name="key_setting_mqtt_serverport">setting_mqtt_serverport</string>
     <string name="default_setting_mqtt_serverport">1883</string>

diff --git a/WallPanelApp/src/main/res/values/strings.xml b/WallPanelApp/src/main/res/values/strings.xml
@@ -103,6 +103,9 @@
     <string name="menu_title_help">Help</string>
     <string name="menu_title_dashboard">Dashboard</string>
 
+    <string name="title_hardware_acceleration">Hardware Acceleration</string>
+    <string name="summary_hardware_acceleration">Works on some devices to speed webpage and camera rendering.</string>
+
     <string name="mail_to_subject_text">WallPanel Feedback</string>
     <string name="mail_subject_text">Send Feedback:</string>
 

diff --git a/WallPanelApp/src/main/res/xml/pref_general.xml b/WallPanelApp/src/main/res/xml/pref_general.xml
@@ -56,6 +56,12 @@
             android:summary="@string/pref_zoom_level_summary"
             android:title="@string/title_setting_test_zoomlevel"/>
 
+        <SwitchPreference
+            android:defaultValue="@string/default_hardware_accelerated_value"
+            android:key="@string/key_hadware_accelerated_enabled"
+            android:title="@string/title_hardware_acceleration"
+            android:summary="@string/summary_hardware_acceleration"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/preference_title_screen">