am f75255fb: hwsample: Apply fake icons and labels in FakeHdmiService

* commit 'f75255fb3dd7dd74002106c0b8267bcbac642ad4':
  hwsample: Apply fake icons and labels in FakeHdmiService

5 files changed, 12 insertions, 4 deletions

diff --git a/hwsample/res/drawable-hdpi/fake_icon0.png b/hwsample/res/drawable-hdpi/fake_icon0.png
new file mode 100644
index 00000000..e39cb6b4
--- /dev/null
+++ b/hwsample/res/drawable-hdpi/fake_icon0.png
diff --git a/hwsample/res/drawable-hdpi/fake_icon1.png b/hwsample/res/drawable-hdpi/fake_icon1.png
new file mode 100644
index 00000000..7634404c
--- /dev/null
+++ b/hwsample/res/drawable-hdpi/fake_icon1.png
diff --git a/hwsample/res/drawable-hdpi/fake_icon2.png b/hwsample/res/drawable-hdpi/fake_icon2.png
new file mode 100644
index 00000000..0eabb7e0
--- /dev/null
+++ b/hwsample/res/drawable-hdpi/fake_icon2.png
diff --git a/hwsample/res/drawable-hdpi/fake_icon3.png b/hwsample/res/drawable-hdpi/fake_icon3.png
new file mode 100644
index 00000000..cbd53218
--- /dev/null
+++ b/hwsample/res/drawable-hdpi/fake_icon3.png
diff --git a/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java b/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java
index 68e33e7d..d7dde90d 100644
--- a/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java
+++ b/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java
@@ -21,6 +21,7 @@ import android.content.pm.ResolveInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.hardware.hdmi.HdmiCecDeviceInfo;
 import android.hardware.hdmi.HdmiPortInfo;
@@ -43,6 +44,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -56,7 +58,9 @@ public class FakeHdmiService extends TvInputService {
     private static final boolean DEBUG = true;
     private static final String TAG = FakeHdmiService.class.getSimpleName();
     private static final int PORT_MASK = 0xF000;
-    private static final int[] COLORS = { 0xFFFF0000, 0xFF00FF00, 0xFF0000FF };
+    private static final int[] COLORS = { Color.RED, Color.GREEN, Color.BLUE };
+    private static final int[] ICONS = { R.drawable.fake_icon0, R.drawable.fake_icon1,
+          R.drawable.fake_icon2, R.drawable.fake_icon3 };
 
     private ITvInputManager mManager = null;
     private IHdmiControlService mHdmiControlService = null;
@@ -67,6 +71,7 @@ public class FakeHdmiService extends TvInputService {
     // A map from port address to port ID.
     private SparseIntArray mPortIdMap = new SparseIntArray();
     private ResolveInfo mResolveInfo;
+    private final Random mRandom = new Random();
 
     private static class PortInfo {
         private final int mPortId;
@@ -201,7 +206,9 @@ public class FakeHdmiService extends TvInputService {
         TvInputInfo info = null;
         try {
             info = TvInputInfo.createTvInputInfo(this, mResolveInfo, cecDeviceInfo,
-                    parentInfo.getId(), cecDeviceInfo.getDisplayName(), null);
+                    parentInfo.getId(), cecDeviceInfo.getDisplayName(),
+                    Uri.parse("android.resource://" + getPackageName() + "/"
+                          + ICONS[mRandom.nextInt(ICONS.length)]));
         } catch (XmlPullParserException | IOException e) {
             Log.e(TAG, "Error while creating TvInputInfo", e);
             return null;
@@ -245,7 +252,7 @@ public class FakeHdmiService extends TvInputService {
                     if (mSurface != null) {
                         Canvas c = mSurface.lockCanvas(null);
                         c.drawColor(COLORS[mIndex]);
-                        c.drawText(mLabel, 0f, 0f, mTextPaint);
+                        c.drawText(mLabel, 100f, 200f, mTextPaint);
                         mSurface.unlockCanvasAndPost(c);
                     }
                 }
@@ -260,7 +267,8 @@ public class FakeHdmiService extends TvInputService {
         HdmiInputSessionImpl(TvInputInfo info) {
             mInfo = info;
             mLabel = info.loadLabel(FakeHdmiService.this).toString();
-            mTextPaint.setColor(0xFF000000);
+            mTextPaint.setColor(Color.BLACK);
+            mTextPaint.setTextSize(200);
             mHandler.post(mDrawTask);
         }