Android TV support

5 files changed, 15 insertions, 9 deletions

diff --git a/app/build.gradle b/app/build.gradle
index f84b7b8..1f70830 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,9 +4,9 @@ android {
     compileSdkVersion 28

     defaultConfig {

         applicationId "com.clusterrr.sonyheadphonescontrol"

-        minSdkVersion 26

+        minSdkVersion 18

         targetSdkVersion 28

-        versionCode 1

+        versionCode 2

         versionName "1.0"

     }

     buildTypes {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b0bcd39..fc76496 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,12 +6,17 @@
         android:name="android.hardware.touchscreen"

         android:required="false" />

 

+    <uses-feature

+        android:name="android.software.leanback"

+        android:required="false" />

+

     <supports-screens

         android:anyDensity="true"

         android:largeScreens="true"

         android:normalScreens="true"

         android:smallScreens="true"

         android:xlargeScreens="true" />

+

     <uses-permission android:name="android.permission.BLUETOOTH" />

 

     <application

diff --git a/app/src/main/java/com/clusterrr/sonyheadphonescontrol/MainActivity.java b/app/src/main/java/com/clusterrr/sonyheadphonescontrol/MainActivity.java
index 34b92aa..7db990d 100644
--- a/app/src/main/java/com/clusterrr/sonyheadphonescontrol/MainActivity.java
+++ b/app/src/main/java/com/clusterrr/sonyheadphonescontrol/MainActivity.java
@@ -46,7 +46,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                     int volume = bundle.getInt(TaskerFireReceiver.EXTRA_STRING_VOLUME, 20);

                     boolean voice = bundle.getBoolean(TaskerFireReceiver.EXTRA_STRING_VOICE, false);

                     ((RadioButton) findViewById(R.id.radioButtonAmbientSound)).setChecked(true);

-                    ((SeekBar) findViewById(R.id.seekBarVolume)).setProgress(volume);

+                    ((SeekBar) findViewById(R.id.seekBarVolume)).setProgress(volume - 1);

                     ((Switch) findViewById(R.id.switchVoiceOptimized)).setChecked(voice);

             }

         }

@@ -84,7 +84,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             blurb = ((RadioButton) findViewById(R.id.radioButtonWindCancelling)).getText().toString();

         } else if (((RadioButton) findViewById(R.id.radioButtonAmbientSound)).isChecked()) {

             mode = 3;

-            volume = ((SeekBar) findViewById(R.id.seekBarVolume)).getProgress();

+            volume = ((SeekBar) findViewById(R.id.seekBarVolume)).getProgress() + 1;

             voice = ((Switch) findViewById(R.id.switchVoiceOptimized)).isChecked();

             blurb = ((RadioButton) findViewById(R.id.radioButtonAmbientSound)).getText().toString() +

                     ", volume=" + volume + (voice ? ", voice optimized" : "");

diff --git a/app/src/main/java/com/clusterrr/sonyheadphonescontrol/TaskerFireReceiver.java b/app/src/main/java/com/clusterrr/sonyheadphonescontrol/TaskerFireReceiver.java
index b6e066b..51e242e 100644
--- a/app/src/main/java/com/clusterrr/sonyheadphonescontrol/TaskerFireReceiver.java
+++ b/app/src/main/java/com/clusterrr/sonyheadphonescontrol/TaskerFireReceiver.java
@@ -40,6 +40,7 @@ import java.util.concurrent.ExecutionException;
 public final class TaskerFireReceiver extends BroadcastReceiver {

     public static final String TAG = "SonyHeadphonesControl";

     public static final UUID uuid = UUID.fromString("96cc203e-5068-46ad-b32d-e316f5e069ba");

+    public static final UUID uuid_alt = UUID.fromString("ba69e0f5-16e3-2db3-ad46-68503e20cc96");

     public static final String ACTION_FIRE_SETTING = "com.twofortyfouram.locale.intent.action.FIRE_SETTING"; //$NON-NLS-1$

     public static final String EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"; //$NON-NLS-1$

     public static final String EXTRA_STRING_BLURB = "com.twofortyfouram.locale.intent.extra.BLURB"; //$NON-NLS-1$

@@ -130,7 +131,7 @@ public final class TaskerFireReceiver extends BroadcastReceiver {
         for (BluetoothDevice device : devices) {

             ParcelUuid[] uuids = device.getUuids();

             for (ParcelUuid u : uuids) {

-                if (u.toString().equals(uuid.toString())) {

+                if (u.toString().equals(uuid.toString()) || u.toString().equals(uuid_alt.toString())) {

                     headset = device;

                     break;

                 }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fe47d6d..4d93c94 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -74,9 +74,8 @@
                 android:layout_width="0dp"

                 android:layout_height="wrap_content"

                 android:layout_marginEnd="32dp"

-                android:max="20"

-                android:min="1"

-                android:progress="20"

+                android:max="19"

+                android:progress="19"

                 app:layout_constraintBottom_toBottomOf="@+id/textView"

                 app:layout_constraintEnd_toEndOf="parent"

                 app:layout_constraintStart_toEndOf="@+id/textView"

@@ -112,6 +111,7 @@
         android:layout_height="wrap_content"

         android:layout_marginStart="16dp"

         android:layout_marginEnd="16dp"

+        android:layout_marginBottom="16dp"

         android:text="@string/test"

         app:layout_constraintBottom_toTopOf="@+id/buttonSave"

         app:layout_constraintEnd_toEndOf="parent"

@@ -123,7 +123,7 @@
         android:layout_height="wrap_content"

         android:layout_marginStart="16dp"

         android:layout_marginEnd="16dp"

-        android:layout_marginBottom="24dp"

+        android:layout_marginBottom="16dp"

         android:text="@string/save"

         app:layout_constraintBottom_toBottomOf="parent"

         app:layout_constraintEnd_toEndOf="parent"