From 56d64e51b5aec6dd9d2ea5768157eb474a7c485c Mon Sep 17 00:00:00 2001
From: farmerbb <farmerbb@gmail.com>
Date: Sat, 20 Aug 2016 16:49:04 -0600
Subject: [PATCH] Taskbar 1.1.7
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

• Fixes for Android TV devices
---
 app/build.gradle                                             |  2 +-
 .../com/farmerbb/taskbar/activity/ContextMenuActivity.java   | 10 ++--------
 .../java/com/farmerbb/taskbar/activity/DummyActivity.java    | 12 +++++++++++-
 .../res/{values-sw600dp-v24 => values-w600dp-v24}/dimens.xml |  0
 .../res/{values-sw600dp-v24 => values-w600dp-v24}/styles.xml |  0
 .../main/res/{values-sw600dp => values-w600dp}/dimens.xml    |  0
 .../main/res/{values-sw600dp => values-w600dp}/styles.xml    |  0
 app/src/main/res/values/strings.xml                          |  1 +
 8 files changed, 15 insertions(+), 10 deletions(-)
 rename app/src/main/res/{values-sw600dp-v24 => values-w600dp-v24}/dimens.xml (100%)
 rename app/src/main/res/{values-sw600dp-v24 => values-w600dp-v24}/styles.xml (100%)
 rename app/src/main/res/{values-sw600dp => values-w600dp}/dimens.xml (100%)
 rename app/src/main/res/{values-sw600dp => values-w600dp}/styles.xml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 914761c2..85065557 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 24
 
-        versionCode 49
+        versionCode 50
         versionName "1.1.7"
 
         resConfigs "en"
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index b518b99e..5b25eea1 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -134,14 +134,8 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
             }
         } else {
             appName = getIntent().getStringExtra("app_name");
-
-            if(getResources().getConfiguration().smallestScreenWidthDp >= 600
-                    && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M)
-                setTitle(appName);
-            else {
-                addPreferencesFromResource(R.xml.pref_context_menu_header);
-                findPreference("header").setTitle(appName);
-            }
+            addPreferencesFromResource(R.xml.pref_context_menu_header);
+            findPreference("header").setTitle(appName);
 
             final PackageManager pm = getPackageManager();
             Intent homeIntent = new Intent(Intent.ACTION_MAIN);
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/DummyActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/DummyActivity.java
index 0170020a..ae1d77e0 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/DummyActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/DummyActivity.java
@@ -17,11 +17,13 @@ package com.farmerbb.taskbar.activity;
 
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Toast;
 
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.receiver.LockDeviceReceiver;
@@ -51,7 +53,15 @@ public class DummyActivity extends Activity {
                 Intent intent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN);
                 intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, new ComponentName(this, LockDeviceReceiver.class));
                 intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION, getString(R.string.device_admin_description));
-                startActivity(intent);
+
+                try {
+                    startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    Toast toast = Toast.makeText(this, getString(R.string.lock_device_not_supported), Toast.LENGTH_SHORT);
+                    toast.show();
+
+                    finish();
+                }
             } else finish();
         }
     }
diff --git a/app/src/main/res/values-sw600dp-v24/dimens.xml b/app/src/main/res/values-w600dp-v24/dimens.xml
similarity index 100%
rename from app/src/main/res/values-sw600dp-v24/dimens.xml
rename to app/src/main/res/values-w600dp-v24/dimens.xml
diff --git a/app/src/main/res/values-sw600dp-v24/styles.xml b/app/src/main/res/values-w600dp-v24/styles.xml
similarity index 100%
rename from app/src/main/res/values-sw600dp-v24/styles.xml
rename to app/src/main/res/values-w600dp-v24/styles.xml
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
similarity index 100%
rename from app/src/main/res/values-sw600dp/dimens.xml
rename to app/src/main/res/values-w600dp/dimens.xml
diff --git a/app/src/main/res/values-sw600dp/styles.xml b/app/src/main/res/values-w600dp/styles.xml
similarity index 100%
rename from app/src/main/res/values-sw600dp/styles.xml
rename to app/src/main/res/values-w600dp/styles.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71e128b1..2bb31d13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,6 +152,7 @@
 
     <string name="device_admin_description_short">Allows Taskbar to lock this device via the start menu</string>
     <string name="device_admin_description">Allows Taskbar to lock this device via the start menu.\n\nThis will require you to deactivate Taskbar as a device administrator prior to installing.</string>
+    <string name="lock_device_not_supported">Not supported on this device</string>
 
     <string name="pref_title_shortcut_icon">Show shortcut icon for pinned apps</string>
 
-- 
2.11.0