From 0af60fc747605110d0473c2c6fcfbcbed19d54b2 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Fri, 14 Jan 2011 11:11:31 -0800
Subject: [PATCH] Fix WXGA skin

Change-Id: Ia283c1f9774318661c7164fdb9da70c72bb26bdc
---
 tools/emulator/skins/WXGA/background_land.png | Bin 26092 -> 18432 bytes
 tools/emulator/skins/WXGA/background_port.png | Bin 30459 -> 19995 bytes
 tools/emulator/skins/WXGA/layout              | 419 ++----------------
 3 files changed, 34 insertions(+), 385 deletions(-)

diff --git a/tools/emulator/skins/WXGA/background_land.png b/tools/emulator/skins/WXGA/background_land.png
index fe828241d42613cf22c1f50111747a8872e76613..cb10cd87d8dbcaac0971f19416210fee715c41f7 100755
GIT binary patch
literal 18432
zcmeHPZ%kWN6o2igEg*w278J46iJ}o#7oC7(Z6PoQvK5^Ren5&Yh6ssN(ZDEeDQqHh
zfqhtHkwTjpx0oqx8U!<-Fx)zWp_nGlS)m064`i%BSxZa%>cxV*`x5=2@ssD<%jtdR
zou2#Wckb`pdm8c%Wrc;rgb)M~mVF@OWrE=BA&4#cJT{V)auYu%2mz6uk@iX@Yku@{
zV+$wd#CU6NRQfi3dPYuG8YeO=YzL>J|4n&o0gJ=Q%got+TB1LY)?d~6@Hv}r{_C;a
zw)ga=;ycE-3sZ0Px|fE8{;6;lJBSw{kkk-?2l)|=BHuTwN@mCx;#kVN<$pE{JhTh-
zrVc;9@;*$3M50^0pQaME)y##?IOYu8HWsdSgcNPT-?e$z9<Rr)DQ0|X`CHSvg&RL~
z_tl6Dl*0BP{wZYUvl~s;|JMJ-%x?A80inUWG;!^tW}%E)G{&hZH<@yn|KdjP1{_oP
zw5Fw{#bUA4hsX7~r(4Q;7O(dzij^Eyk4gFtWtNJStMgr^wtcHeg|vYxNvZmV(M#2u
zuCc1Q!Emv6=F_HO?F)R@g|cDv?!B8bv6?E->fFy);zOwC99!)7I`U=8_d{-*yJpCq
z<C992r_*UpB2{1dVwFvg(YsBvS0K-swD+yvZLJtfAv<I34s*ry1zD+>ELJ4qqp15K
zwp1rlF3<d!(lJ%3(@~BZ)UJN)XfS<f*oJvpmC-v;$0d8T=+nc}d#^IazA>oXX|PgV
zjncMMw?%E2MQ%<EWSr(oyxeobY3R|K{iDCgsDqv?t1e-e5%*2ePQ5ANi~ZQQYb22)
zWW&&I-0riy8AtHNmvAFa2Q43)csCdCvB%k->Z>JZ@EH)#Qnq!+ZpTe*s1fNd#bB;v
zv9l#$Ce6#>P5Qimu?bUXeYJrFi4H-qZUPFe12$kfgdTw?4+1%eHv@A4z!JbR01vQb
zqccbn080Q%081ce=(HGsC4eP>CD5>R0vu>qpkV{VBV;mY*$G|*fF*$C--6{n`;OU-
zvjC77qzx8e=YX99b`FjJ(D^7}=jh%5b`DO_tOuI_mH?IjmH?J?cmS}Zdjr4{z!Ja`
z*g0V5{$Q##aJZbF(-Z($0$2vfM@VHsDhpCsaK(vsYYV^<i<$r|vCsi_mawygoh9rn
zu{H7^o%^_PX}X9YxE*VC0XD;N@a(_$EO=7_cZ1<>@PBzXxZgL_E>e1yzpDFbbGEH*
zCHv<Da__1Gm8rPNx=|WWJK}>fR{jjz54oZ-(q)&eTyd$FN=C8WC!z66HK@8pdE3v6
zBK69`xWe9BF>G=&t34zIiB@cN3Rh!-GkAQZPO7A+RlCkTX}@l<9l<pA&n3z|9EViw
zTb>$fCI!E$mcCCg^3|RRYP7<-RxCpr?nk9B)PA4q=w5y%Z5x2jaTUI%F*e1i7q3O@
zP(2QpRqaOwItGQeSFDeSmE|grW35n!^Hy;ae_z#tZD2Oe<h3l+%Rb;Ts!#ZP`)4oC
znVU(2&uK}rRy$Dn4Xq=n(dAaFf15RgX{l6&^Nu!Q{4ySD+V(^zQ!bONJXxs2Z>ALF
zNp!LZa}@nlE-xba3B4)&>ahoKX}2DgTM?Xp5?faVa-<>dxZ@dyG>xTHrR5%G*nu>N
zdF1O1X)P-FQhWA1qyN`5L<|oyq#Vw&o3s1iHau}#hcpPZ^$clf$c!WOjZb#sV~2}0
zq$P(xic6!TM#$*zo?~>}R-~a$&fkxB=Pu+P;fHUX#9bMSG;qgLPvO$Pa_~agXC)_d
V<4-;HF{<oCWM>}AXiqPy{T=Xg!h-++

literal 26092
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

diff --git a/tools/emulator/skins/WXGA/background_port.png b/tools/emulator/skins/WXGA/background_port.png
index 0dee95d8de8e1ddf992deeac11c1b2b04690989e..76851dacf516cf488d7d099fb613f2d3ed632250 100755
GIT binary patch
literal 19995
zcmeHP{ZAWZ96!3^fMy-e0l_JBZfxot7?Z6iFYS2AAR3qhWC^gtM8U*t;35Kras`4@
z6j(&uRD{mN7~^<J)Um)yfkh{Xl(|TUytKf8vH~r%P+EF--qYUIf55~get*2))93a3
zJkRI*`F`*7;i;69yZj#a!!T@Da#F%+4BL@`Vcy4mc+4;BM+G>BiLm5^6X_*hD-$u_
zH`fHdKhwB-{ndnP{QkJk`b%RY0|WG|=BLg}>HYluRU-aVhTwoWpJ!Hw_Z_edH$6L^
zuPV#SdAs&YRgAcId$otQ$15-|9^c1bRCtUh?#N5~Xpczh{>d4pq|1fO8`razd1^OK
zUk_v78YHdm|49{nMZN~LvAgS>FI(23$@kQn!*iIrSI=d++K?&~lqHyJAp5d{>S-^V
z_>AoV)7&EuNpq92N#=<HwW?%ocK)}^gmdk7D?yc-drF(xzDo6NJaNJF%_8HNN=;9y
z%4}9mSAA1N$OCnnlXMt6B-GYis)V#U?Ur>}9ycuh$YYVmbcb8Z*MAPeqszC<5~KQV
zDwVQkBW=3vL0xI4buT-uN<nkQlw*1P2c~5^MQ%5Q#JtpWhS=N~v=A3c9O2*M+p%&-
zx>F^5U_$H1tV<=4p--=D2t{o-XeyfG$zquuudvTAYd1xn)e7dNwnUej_5H!SDa)@{
zsVMTk=~G3%`ua|8{rDsPk)&{Q<g2Ls=q=5Giw@Ir=Egr2JX%RF)AZVym>kb<Rc#o1
zlRT^4(zg`UTM%6`_e-6)_YZn$k(e4f$hMq&LP{Uaz9Zy18?L0go03_(=&MptSvS6Z
zlAEX;DP44=kt^!$MRpY?MzQ9_?^aO8*A8*L74RGdGqvw=R`sqIscn0Ov*JL$RW}f@
z!Wyl=f#>MR`urgK_?(YHU328GN_I_0y{&lH3(4$Y&iIcKg3KRxc$UMUKL6$?Y|&1U
zk`8QtYbV=#Y0xMP6sv?4MYaQ`i#7@DQFL&?VT4XdICarQ2G<L^+?4{jN2Lk?3@*G1
zfB^slfO_y=_~51?v<UtvLW|&dBeVz%144_y8KLVD$T1gM1QrmXMW8zoy##;(00S`f
zK&1ecf?yI8`U5KEe?_HSyO9{j<pMy!2?9>&41j<Wg!v(#0r(?Cq5*$|CIR>(7diy~
z2>2sNmxH`O=17E89CR;0Dh|3AAQcBuCy<H*{1K#`Lw-F(*4*p~MAjg(29Y(0tN}7|
zaVHR2bB7in$OJ(qw<W+=O|D2AP${lB15hddIh9iPg<*)%3m8JW0PZacIf7`5f+qu>
z40tl&$$%#Vo(xEfz}FM-^#rKm{9E!rh1;r#wflpOHY!FQ?{b7t61FX@(6C5|&rg=%
zrdziCTsq>`^E^gFX{;?PbRkC;;3=*3u7Bg+RjQ}hG<`BuZgpg>6?@(hS^B%F5|w=0
zN!OZA(Nk)Ip1F0gLf|aW-LoBLE55lWlF@ErbgD>3Jqnl4=g=1_UTitLv^v#;RG+@%
zh0^3=4n7f$aG*QZ8TpNNkr9;oGZU9veiuue=6J$fH^>M@Sr%|fY`N8NM~f4rzP~!E
zc=ZW;hIOB5Si%V{@z44;SIo)$+S25za{KyTLenZCHY6$|F5J*bA~t7DlGN5%xmJ5T
z)t!v$FEY<~3rQOhO0CEeJ!7k8B*8?=+g!Clhm>^qa_)3E+e^JtK}Go(-eJr4)iCN}
zf~YH9FSC_KKCPsMJQ=6NRroqn-GFdmg)?rUpFv%%2;n9v`wF8n)>&QJ<DLSn@?mej
akM^QI{@`>HUe8FsVOVlvN<w>FZq?s-uDtvJ

literal 30459
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
EH$Jtn<NyEw

diff --git a/tools/emulator/skins/WXGA/layout b/tools/emulator/skins/WXGA/layout
index 9d6c8c45f..0aaeb1ed0 100755
--- a/tools/emulator/skins/WXGA/layout
+++ b/tools/emulator/skins/WXGA/layout
@@ -12,389 +12,22 @@ parts {
 
     device {
         display {
-            width   800
-            height  1280
+            width   1280
+            height  800
             x       0
             y       0
         }
     }
     
-    controls {
-        background {
-            image   controls.png
-        }
-        buttons {
-            soft-left {
-                    image button.png
-                    x 56
-                    y 142
-            }
-            home {
-                    image button.png
-                    x 0
-                    y 142
-            }
-            back {
-                    image button.png
-                    x 112
-                    y 142
-            }
-            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-dial {
-                    image button.png
-                    x 0
-                    y 71
-            }
-            phone-hangup {
-                    image button.png
-                    x 168
-                    y 71
-            }
-
-            power {
-                    image button.png
-                    x 168
-                    y 0
-            }
-
-            volume-up {
-                    image button.png
-                    x 112
-                    y 0
-            }
-
-            volume-down {
-                    image button.png
-                    x 56
-                    y 0
-            }
-
-            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 {
-    portrait {
-        width     1270
-        height    1334
-        color     0xe0e0e0
-        event     EV_SW:0:1
-        
-        part1 {
-            name    portrait
-            x       0
-            y       0
-        }
-
-        part2 {
-            name    landscape
-            x       1400
-            y       0
-        }
-
-        part3 {
-            name    device
-            x       27
-            y       27
-        }
-        part4 {
-            name    controls
-            x       955
-            y       367
-        }
-        part5 {
-            name    keyboard
-            x       874
-            y       619
-        }
-
-    }
 
     landscape {
         width     1333
-        height    1081
+        height    855
         color     0xe0e0e0
-        event     EV_SW:0:0
-
-        dpad-rotation 3
+        event     EV_SW:0:1
 
         part1 {
             name    portrait
@@ -411,22 +44,38 @@ layouts {
         part3 {
             name      device
             x         26
-            y         829
-            rotation  3
-        }
-
-        part4 {
-            name     controls
-            x        779
-            y        876
-        }
-
-        part5 {
-            name     keyboard
-            x        338
-            y        876
+            y         29
         }
     }
+
+    portrait {
+        width     853
+        height    1334
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        dpad-rotation 3
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       1400
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       27
+            y       1307
+            rotation  3
+        }
+    }
+
 }
 
 keyboard {