Remove AndroidTV skin and use dynamic skin
Ji-Hwan Lee [Thu, 15 May 2014 14:08:49 +0000 (23:08 +0900)]
Change-Id: I7b07deb434282a20781948ddf52b2047beb34e26

15 files changed:
config.ini [new file with mode: 0644]
products/atv_generic.mk
sdk/atv_sdk.atree
skins/AndroidTV/arrow_down.png [deleted file]
skins/AndroidTV/arrow_left.png [deleted file]
skins/AndroidTV/arrow_right.png [deleted file]
skins/AndroidTV/arrow_up.png [deleted file]
skins/AndroidTV/button.png [deleted file]
skins/AndroidTV/controls.png [deleted file]
skins/AndroidTV/hardware.ini [deleted file]
skins/AndroidTV/key.png [deleted file]
skins/AndroidTV/keyboard.png [deleted file]
skins/AndroidTV/layout [deleted file]
skins/AndroidTV/select.png [deleted file]
skins/AndroidTV/spacebar.png [deleted file]

diff --git a/config.ini b/config.ini
new file mode 100644 (file)
index 0000000..bc94819
--- /dev/null
@@ -0,0 +1,21 @@
+# Provide only 1080p for emualator build target, unlike devices.xml for SDK release.
+hw.ramSize=2048
+hw.screen=no-touch
+hw.mainKeys=yes
+hw.trackBall=no
+hw.keyboard=yes
+hw.dPad=yes
+hw.gps=no
+hw.battery=no
+hw.accelerometer=no
+hw.lcd_density=320
+hw.gpu.enabled=yes
+hw.camera.back=none
+hw.camera.front=emulated
+hw.sensors.proximity=no
+hw.sensors.magnetic_field=no
+hw.sensors.orientation=no
+hw.sensors.temperature=no
+skin.dynamic=yes
+skin.name=1920x1080
+skin.path=1920x1080
index f7794f5..0e700af 100644 (file)
@@ -19,7 +19,7 @@ PRODUCT_PACKAGES_DEBUG := \
     SampleTvInput
 
 PRODUCT_COPY_FILES := \
-    $(foreach f,$(wildcard device/google/atv/skins/AndroidTV/*),$(f):skin/$(notdir $(f)))
+    device/google/atv/config.ini:config.ini
 
 PRODUCT_PACKAGE_OVERLAYS := \
     device/google/atv/sdk_overlay \
index d73b193..457eefe 100644 (file)
@@ -19,6 +19,3 @@ ${HOST_OUT}/device/google/atv/sdk/images_${TARGET_CPU_ABI}_source.properties  sy
 
 # devices.xml file with custom device definitions
 device/google/atv/sdk/devices.xml   system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/devices.xml
-
-# Android TV skins
-device/google/atv/skins/AndroidTV   system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/skins/AndroidTV
diff --git a/skins/AndroidTV/arrow_down.png b/skins/AndroidTV/arrow_down.png
deleted file mode 100644 (file)
index b9fde22..0000000
Binary files a/skins/AndroidTV/arrow_down.png and /dev/null differ
diff --git a/skins/AndroidTV/arrow_left.png b/skins/AndroidTV/arrow_left.png
deleted file mode 100644 (file)
index 281b192..0000000
Binary files a/skins/AndroidTV/arrow_left.png and /dev/null differ
diff --git a/skins/AndroidTV/arrow_right.png b/skins/AndroidTV/arrow_right.png
deleted file mode 100644 (file)
index 4cbc65d..0000000
Binary files a/skins/AndroidTV/arrow_right.png and /dev/null differ
diff --git a/skins/AndroidTV/arrow_up.png b/skins/AndroidTV/arrow_up.png
deleted file mode 100644 (file)
index 29c7121..0000000
Binary files a/skins/AndroidTV/arrow_up.png and /dev/null differ
diff --git a/skins/AndroidTV/button.png b/skins/AndroidTV/button.png
deleted file mode 100644 (file)
index 8281d20..0000000
Binary files a/skins/AndroidTV/button.png and /dev/null differ
diff --git a/skins/AndroidTV/controls.png b/skins/AndroidTV/controls.png
deleted file mode 100644 (file)
index 04b85e2..0000000
Binary files a/skins/AndroidTV/controls.png and /dev/null differ
diff --git a/skins/AndroidTV/hardware.ini b/skins/AndroidTV/hardware.ini
deleted file mode 100644 (file)
index 08b3852..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-hw.accelerometer=no
-hw.battery=no
-hw.dPad=yes
-hw.gps=no
-hw.gsmModem=no
-hw.keyboard=yes
-hw.keyboard.lid=no
-hw.lcd.density=320
-hw.ramSize=2048
-hw.screen=no-touch
-hw.sensors.magnetic_field=no
-hw.sensors.orientation=no
-hw.sensors.proximity=no
-hw.sensors.temperature=no
-vm.heapSize=512
diff --git a/skins/AndroidTV/key.png b/skins/AndroidTV/key.png
deleted file mode 100644 (file)
index 40b03bf..0000000
Binary files a/skins/AndroidTV/key.png and /dev/null differ
diff --git a/skins/AndroidTV/keyboard.png b/skins/AndroidTV/keyboard.png
deleted file mode 100644 (file)
index ca49dcf..0000000
Binary files a/skins/AndroidTV/keyboard.png and /dev/null differ
diff --git a/skins/AndroidTV/layout b/skins/AndroidTV/layout
deleted file mode 100644 (file)
index bcbef75..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-parts {
-    device {
-        display {
-            width   1920
-            height  1080
-            x       0
-            y       0
-        }
-    }
-
-    controls {
-        background {
-            image   controls.png
-        }
-        buttons {
-            camera {
-                image   button.png
-                x       0
-                y       0
-            }
-            volume-down {
-                image   button.png
-                x       56
-                y       0
-            }
-            volume-up {
-                image   button.png
-                x       112
-                y       0
-            }
-            power {
-                image   button.png
-                x       168
-                y       0
-            }
-
-            phone-dial {
-                image   button.png
-                x       0
-                y       71
-            }
-            dpad-up {
-                image   arrow_up.png
-                x       77
-                y       53
-            }
-            dpad-down {
-                image   arrow_down.png
-                x       77
-                y       106
-            }
-            dpad-left {
-                image   arrow_left.png
-                x       53
-                y       53
-            }
-            dpad-right {
-                image   arrow_right.png
-                x       123
-                y       53
-            }
-            dpad-center {
-                image   select.png
-                x       77
-                y       81
-            }
-            phone-hangup {
-                image   button.png
-                x       168
-                y       71
-            }
-
-            home {
-                image   button.png
-                x       0
-                y       142
-            }
-            soft-left {
-                image   button.png
-                x       56
-                y       142
-            }
-            back {
-                image   button.png
-                x       112
-                y       142
-            }
-            search {
-                image   button.png
-                x       168
-                y       142
-            }
-        }
-    }
-
-    keyboard {
-        background {
-            image   keyboard.png
-        }
-        buttons {
-            1 {
-                image   key.png
-                x       5
-                y       5
-            }
-            2 {
-                image   key.png
-                x       42
-                y       5
-            }
-            3 {
-                image   key.png
-                x       79
-                y       5
-            }
-            4 {
-                image   key.png
-                x       116
-                y       5
-            }
-            5 {
-                image   key.png
-                x       153
-                y       5
-            }
-            6 {
-                image   key.png
-                x       190
-                y       5
-            }
-            7 {
-                image   key.png
-                x       227
-                y       5
-            }
-            8 {
-                image   key.png
-                x       264
-                y       5
-            }
-            9 {
-                image   key.png
-                x       301
-                y       5
-            }
-            0 {
-                image   key.png
-                x       338
-                y       5
-            }
-
-            q {
-                image   key.png
-                x        5
-                y        41
-            }
-            w {
-                image   key.png
-                x       42
-                y       41
-            }
-            e {
-                image   key.png
-                x       79
-                y       41
-            }
-            r {
-                image   key.png
-                x       116
-                y       41
-            }
-            t {
-                image   key.png
-                x       153
-                y       41
-            }
-            y {
-                image   key.png
-                x       190
-                y       41
-            }
-            u {
-                image   key.png
-                x       227
-                y       41
-            }
-            i {
-                image   key.png
-                x       264
-                y       41
-            }
-            o {
-                image   key.png
-                x       301
-                y       41
-            }
-            p {
-                image   key.png
-                x       338
-                y       41
-            }
-
-            a {
-                image   key.png
-                x        5
-                y       77
-            }
-            s {
-                image   key.png
-                x       42
-                y       77
-            }
-            d {
-                image   key.png
-                x       79
-                y       77
-            }
-            f {
-                image   key.png
-                x       116
-                y       77
-            }
-            g {
-                image   key.png
-                x       153
-                y       77
-            }
-            h {
-                image   key.png
-                x       190
-                y       77
-            }
-            j {
-                image   key.png
-                x       227
-                y       77
-            }
-            k {
-                image   key.png
-                x       264
-                y       77
-            }
-            l {
-                image   key.png
-                x       301
-                y       77
-            }
-            DEL {
-                image   key.png
-                x       338
-                y       77
-            }
-
-            CAP {
-                image   key.png
-                x        5
-                y       113
-            }
-            z {
-                image   key.png
-                x       42
-                y       113
-            }
-            x       {
-                image   key.png
-                x       79
-                y       113
-            }
-            c {
-                image   key.png
-                x       116
-                y       113
-            }
-            v {
-                image   key.png
-                x       153
-                y       113
-            }
-            b {
-                image   key.png
-                x       190
-                y       113
-            }
-            n {
-                image   key.png
-                x       227
-                y       113
-            }
-            m {
-                image   key.png
-                x       264
-                y       113
-            }
-            PERIOD {
-                image   key.png
-                x       301
-                y       113
-            }
-            ENTER {
-                image   key.png
-                x       338
-                y       113
-            }
-
-            ALT {
-                image   key.png
-                x       5
-                y       149
-            }
-            SYM {
-                image   key.png
-                x       42
-                y       149
-            }
-            AT {
-                image   key.png
-                x       79
-                y       149
-            }
-            SPACE {
-                image   spacebar.png
-                x       116
-                y       149
-            }
-            SLASH {
-                image   key.png
-                x       264
-                y       149
-            }
-            COMMA {
-                image   key.png
-                x       301
-                y       149
-            }
-            ALT2 {
-                image   key.png
-                x       338
-                y       149
-            }
-
-        }
-    }
-}
-
-layouts {
-    landscape {
-        width   2350
-        height  1080
-        color   0x323232
-        event   EV_SW:0:0
-
-        part1 {
-            name    device
-            x       0
-            y       0
-        }
-
-        # 217 x 191
-        part2 {
-            name    controls
-            x       2026
-            y       25
-        }
-
-        # 380 x 191
-        part3 {
-            name    keyboard
-            x       1945
-            y       241
-        }
-    }
-}
-
-keyboard {
-    charmap qwerty2
-}
-
-network {
-    speed  full
-    delay  none
-}
diff --git a/skins/AndroidTV/select.png b/skins/AndroidTV/select.png
deleted file mode 100644 (file)
index f4a65d3..0000000
Binary files a/skins/AndroidTV/select.png and /dev/null differ
diff --git a/skins/AndroidTV/spacebar.png b/skins/AndroidTV/spacebar.png
deleted file mode 100644 (file)
index aa459bd..0000000
Binary files a/skins/AndroidTV/spacebar.png and /dev/null differ