From 2ae77029fda816d029b4bfe2620bd4f01022aab0 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 23 Jan 2023 21:15:43 +0000
Subject: [PATCH] Remove CanvasCompare.

As part of renderscript deprecation/removal, of the two pieces of
renderscript in this app, one already had a Java alternative but the
heatmap code didn't. Rather than reimplement that, though, it appears
that this project has been obsoleted by CtsUiRenderingTestCases. So
let's remove it instead. (Even if we're wrong, this still gives us more
time to work out what, if anything, is actually needed.)

Bug: http://b/255624710
Test: treehugger
Change-Id: I7cf64a28bd3c7edea061fafc5e06d4134cc79b05
---
 tests/CanvasCompare/Android.bp                |  63 ---
 tests/CanvasCompare/AndroidManifest.xml       |  48 --
 tests/CanvasCompare/OWNERS                    |   1 -
 tests/CanvasCompare/res/drawable/sunset1.jpg  | Bin 28050 -> 0 bytes
 .../res/layout/automatic_layout.xml           |  38 --
 .../res/layout/manual_layout.xml              | 119 -----
 tests/CanvasCompare/res/values/strings.xml    |  31 --
 tests/CanvasCompare/res/values/values.xml     |  25 -
 .../test/hwuicompare/AutomaticActivity.java   | 310 -----------
 .../test/hwuicompare/CompareActivity.java     | 122 -----
 .../test/hwuicompare/DisplayModifier.java     | 503 ------------------
 .../test/hwuicompare/ErrorCalculator.java     | 187 -------
 .../android/test/hwuicompare/MainView.java    |  56 --
 .../test/hwuicompare/ManualActivity.java      | 212 --------
 .../test/hwuicompare/ResourceModifiers.java   | 136 -----
 .../com/android/test/hwuicompare/Test.java    |  46 --
 .../test/hwuicompare/errorCalculator.rscript  |  61 ---
 17 files changed, 1958 deletions(-)
 delete mode 100644 tests/CanvasCompare/Android.bp
 delete mode 100644 tests/CanvasCompare/AndroidManifest.xml
 delete mode 100644 tests/CanvasCompare/OWNERS
 delete mode 100644 tests/CanvasCompare/res/drawable/sunset1.jpg
 delete mode 100644 tests/CanvasCompare/res/layout/automatic_layout.xml
 delete mode 100644 tests/CanvasCompare/res/layout/manual_layout.xml
 delete mode 100644 tests/CanvasCompare/res/values/strings.xml
 delete mode 100644 tests/CanvasCompare/res/values/values.xml
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/AutomaticActivity.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/CompareActivity.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/MainView.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/ManualActivity.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/Test.java
 delete mode 100644 tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rscript

diff --git a/tests/CanvasCompare/Android.bp b/tests/CanvasCompare/Android.bp
deleted file mode 100644
index 98831154ddc2d..0000000000000
--- a/tests/CanvasCompare/Android.bp
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (C) 2012 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package {
-    // See: http://go/android-license-faq
-    default_applicable_licenses: [
-        "frameworks_base_license",
-    ],
-}
-
-android_test {
-    name: "CanvasCompare",
-    srcs: [
-        "src/**/*.java",
-        ":CanvasCompare-rscript{CanvasCompare.srcjar}",
-    ],
-    resource_zips: [
-        ":CanvasCompare-rscript{CanvasCompare.res.zip}",
-    ],
-    platform_apis: true,
-    libs: [
-        "android.test.runner",
-        "android.test.base",
-    ],
-    static_libs: ["junit"],
-}
-
-genrule {
-    name: "CanvasCompare-rscript",
-    srcs: [
-        "src/**/*.rscript",
-        ":rs_script_api",
-        ":rs_clang_headers",
-    ],
-    tools: [
-        "llvm-rs-cc",
-        "soong_zip",
-    ],
-    out: [
-        "CanvasCompare.srcjar",
-        "CanvasCompare.res.zip",
-    ],
-    cmd: "for f in $(locations src/**/*.rscript); do " +
-        "  $(location llvm-rs-cc) -o $(genDir)/res/raw -p $(genDir)/src " +
-        "  -I $$(dirname $$(echo $(locations :rs_script_api) | awk '{ print $$1 }')) " +
-        "  -I $$(dirname $$(echo $(locations :rs_clang_headers) | awk '{ print $$1 }')) $${f}; " +
-        "done && " +
-        "$(location soong_zip) -srcjar -o $(location CanvasCompare.srcjar) -C $(genDir)/src -D $(genDir)/src &&" +
-        "$(location soong_zip) -o $(location CanvasCompare.res.zip) -C $(genDir)/res -D $(genDir)/res",
-}
diff --git a/tests/CanvasCompare/AndroidManifest.xml b/tests/CanvasCompare/AndroidManifest.xml
deleted file mode 100644
index 2734e7f07f273..0000000000000
--- a/tests/CanvasCompare/AndroidManifest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="com.android.test.hwuicompare">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <application android:label="@string/app_name"
-         android:theme="@android:style/Theme.Holo.Light.NoActionBar">
-        <activity android:name="AutomaticActivity"
-             android:label="CanvasAutoCompare"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="ManualActivity"
-             android:label="CanvasManualCompare"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <uses-library android:name="android.test.runner"/>
-    </application>
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-         android:targetPackage="com.android.test.hwuicompare"
-         android:label="HW/SW Canvas comparison tool."/>
-
-</manifest>
diff --git a/tests/CanvasCompare/OWNERS b/tests/CanvasCompare/OWNERS
deleted file mode 100644
index c88a9f82c3475..0000000000000
--- a/tests/CanvasCompare/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include /libs/hwui/OWNERS
diff --git a/tests/CanvasCompare/res/drawable/sunset1.jpg b/tests/CanvasCompare/res/drawable/sunset1.jpg
deleted file mode 100644
index 3b4e056b70d0dd4dd7f1f6197f244848ae282baa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28050
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%0A)z(4z}i&PVSb#kk_D<qWTmN&jk1a
z78cFOiU*c8NM=&=J0KAVHrqG*8saiV6M`@ha8&?pb^zJ~F)=VOFfuSPGBU9;f&c6*
zOiV279BgdtY-}7n9JJ5;&)mh&-!Nb=aB^^p@bHKTaB*=7P`|hYcxi0Bb3YvOKR*|p
zyPmxQ@v=biFo+(;3(@hy=y_qY4}s+epKXQ#7Xe}h#u?S0ock~^($g`)AZ8X;Hg*_9
zM@PSu3Nq*!7@2599*7P`Pfy1{$HYtzzUW9WI(l9Ph*649)6|uTA1NKRQvi{Af?2T2
zOy;Uv=dhMg(4;JJ*IPMrZTGbNY80tS$3h{!;H<8&2bz4XYlKC9H!GWn=$;HqtHN_$
z_dFHFrbgd2caOctQ1)h?tZC^P{}3D<msM1Iz4ysSJ!|ifjq!(y&$r&6_@r;+6B@HG
zyQJ<$-_z+;2DZM~*o2(Y`nLXOGfIYbeqoyub5Aw2KY0EbG@lM=$;b%Wz`#OJ9|79K
zOV2>nn9&tz%oMdV6>*|!Qs8Rmu#B0YTM+TBmaMk<E}=AcxqMW06EmqxXT)N+utz#T
zM?_R!*HTOYP4?8ADmZ&han-%icY87l&n;Kk%4<>S-|GA~D$hQEIOu6=@<MB%R|hAK
zzP+fOT7_;NjFpit3KXrIvTD+j=MPOo7~O1DkhDAg1kKJk^u)nl=(<1KiVm39lufiC
z_^0&Jv#+emJE)>1Ao0SI%PSQXbe`oqSB2)4w|S*!*g0f@FRY&vszVw(d-oO38i#jk
zdL`Lb%`;MZlBO%z-**(GwjQ)@>d!nNvtJ|0>gHEcsFa8Jtv!7_jpA*|eHF|I8CgC5
zI$O@Mt6neC&aLJwI|J%Pg}q#&!LA;vF5Zk~zI<-a$2c;v2L6Sah2wm=SS;@PQH!pw
z{v@OF9X{(c6*3QU&vw4J>tIA`k2%^9WqnQKZIkS%o#IoBC^~qwUGZtKXeLLB_Q?Je
z*PObkx~as5OCY<~>^SaboR>hIF4|gpRir_x_`ag69TuIA_vPi|UZnGRdvo(O)WsZp
z82O-~4*W#~_%Hm4+dUs`KJCrShwZtMQ|5U?w9K;lY^ruA?v$^)y*-AnJs0RzoO6(!
z{fVSQ8w_QFyt5iE(EpBI{zNwSY}eC|pW13?#xL=1t{-vOaLHMGi}a{7tM#=_7YJ#S
z9s5;mo)Xeq<)!_xNX0&oQcF-XI+KC(P8iM6IDA0GlIM`(<|iJA8gYy-#{DtkM9$8{
z$<bDXOwN8a&O@!rVuUO|#A&thbWv9)>X+kGTTGeLc-mW`BOToP&OKJyVp;6Xy-%>G
zb$@_=OizW65x8dFckcO^lVwpon#<yzWpzO+K>3s}zrB61QFZmnlV`<Z-R(u+3B~$C
zg<U0YvJJGfcwIMVNW5c~59-s*&_0wjn(d1a>Kjp?y_fpnA$dA3vUtVQ?!)T_-%rP_
z9Yrb1^Z0|5_0H>gyq*3Bo`~p+V@*W`uYAWDaq{g#tT^#?R91SlLrhos<oBp7$Uhb}
zW!Xx+d>hd>;81mR%+6o^9Y?KP$yMKwz$c=is=;h!h*?OZ!y;Qmov-*E#~H^1tO3u}
z_q8Py?5UO5LNp64nmHhTNbFucx41M&bBh~=JB?|)J#APZsZ;EMx_<8Y==F22*U#|l
z6akimTx^ATtFo4#U%(b(siXF}8<z|mif&kxV+&T+WKSKI;w${bI}4ehoE)0jB<)LP
zp<|lC>tvEYNnsie%)H}^ekdMN&#XEa_~z#I4Et1YL2o>^{msqRJoZ!$>-yPlx%2hM
zW(K~qJYkNPoH+g#^T=I!bLq!vkTWznI(SL@LVE~-67}`gr@Vv~$tNh43-=V&CcdLS
z<?RHQSJMKXB@2^cjx~-s!Ed5hB@4U99J|aM$KUKaIoMXSeLXjaDi|Gn+jClXXeyqo
z+x|{}l1Wy%@KyXC4Gk~f0d97BsN`&|Bv13zm?LK<t2EXt;IIeihF2pCBh~n8jTDCn
z_i-_<S00!5bxp4B#bL!cKfl^_XlJEw)ybjIn|-T{*d1=AYNFvq_i8O#4(>{K>gVUV
zX=*uv+qokc9-lT`%>=8}FzX;benMmx!Sk5jioSM!boVumD{GxM%YOkr5)0y7!^r2r
z?Uz}ac!J$Jl4dr(_%s&B)7q>)+mmutaX@p`BR?cVL95t0hYi^gm*_<4vIlM&5oL8P
ziZq-q5K@OD7&Uhd8xiGIPOs!_pB{^GV_QWy;e1}Y^5)J1Y_=?ATg@IhzaH~0o;tYQ
z%ScWr$v*S#RU0W^yl^Wgyv4;|Jw>~9Z)9G~ur=H8noEkq0WXe;Q(H|C_ul!~hairX
zT(RBPM89hq|GDk$Rr}$Z4+W$9)#FCVTO!@2BesT44;4;_J9fUkYAe$H;OX>Gk-1oU
zz~(WVV7S2gH;<XwHF@@?y?ZRvbi<8r-JLDs9H-UmyYu(k+e+uBoZLtMwsoh&ZsGfD
zG>wW+N?&|k%0}9dSn{aAWBL>kzCAO`n&E&|UT(H|4(ijI!{04FpLNR3uM;m7vHrl#
z@0hXkeyszxc(9Aocj{IA^JB*h*Y1!oX^JhD?U7d&+rg=)e5d5GT1xT<HQ6tAI%l@e
z_KtkqM$GZ?8asbh)%y93Y5ZNZ6YlHCV^*!*9aTk-?=i=9>_?n`*Dbye3yomc%f}sM
z*f4qT`hoa&d^a>Clap6hCvIaH9TrGVIDP&J)4`_V9`o9kE!!-{w#cKDWWIYz99a{Y
z?3_gZRddoe=7w$KyUnU=Q@dC8+bN9bwQ-p4Y_}5#pQ<mjzA>F8`&~xv%C!W3u6ji7
z^}H3$n%@Pk1f|O2)`xU^#Q7F_NpS049gbTsWm%j@`OKp(89)9_BgWK3<wB3}ZIhsq
zlP~T@Pj4^c=29N%xG2heWXqL|aiag`Q?rmmLbE7Gm&1v#*SdSm8eQupe7aX&8JaX#
zmk?N^iGP0XoE`W1w?|rQ`;26#AKC1?tO+AL^5eNYR;Tcmo_WuWV3r$=GsS17M>Dx^
ztOVl}jbQLMA>5N?$U+x8nO8nc9me2I@Ku#fqVXx$riX?dPZRX~VCV48cQuDSMYoKz
zm_NJHa=9JO5#!a>ad~x^(+keVsOvtSNB8b?9S$gq-<go>tDdbR8p}%_;yfS(-#Q&b
z$8onS{L>ht9x+n_3chwlWO~0|?gt%#&tu0NxhGq%v5#bkUkba-lt1M+?J+u>G8Pkm
zG3muDbT|^rw~4ggQRl`iL^d1D-hSFoX%?z(<AA@%9xaQ{LHgaFNI6RujgZ2WOrwvQ
zg>LV*Q~#>#umRR`^pbTtU5`;qMOezMt(#S@UVez#=R6IY9M6aAlR8$BR^e?+%fWU(
zd;gt3rzqT80Uzlg<*7XwbVFwNK#@x7-IiTl2jWy%ty+Y1GjJ}WSSw56T1)K&n>eM4
zR1UWCs$|bidzniH9@ABPZeG<>_EN7!nJd5G<#p$q_ryG}xu<^&TDeX8L}X7NuTT74
zCpO0lv70+y@z4(r6(*=lZm`U6pqJU2>gRQ|m6=^l_gG+hzD2>4sNwZG1%VfzLV<@q
zjy4G=pCC|XP`j+_vdh;>dTzMjUW}7gM5u&4zVjeFfwd70S4zRuvs|fc;(jIe{@Rsp
z#O@xAGw)9Cea7>^KLr_9GMsTYhN*~NC}>0Fp_`_1nr#|f0`*2EkfeTBO!lSIGijaa
z5*cP8D?|%r748<0(s{zN@K097PH<~Fs#JdHO>Wn(wqCn~dz|UywwM@mhidza2W)JE
zntKvT6^OR4orFd9%4_S_WL25_oS@n&vv=Rg`YLG1Ad9+NvaOpYPCBWip1I({mgg&z
zpX(Se<G|`5buq&|avMsZ;Kb#vr(jpWvi*E()yZ>q5A{$xBV3#w-qz0iURT`Q{YgR0
zQ?47wmi4*WgJD-}N<rlomYTE|hW=67r%5Y|G8y8SqXzKPSe)iSrEy7vc?4^ypbduP
zWN~lX`_cHl2gK+CSHDnet}GVoJz;jAz?ObVQpgB{dqn7+U{IC~Gi8vzSGg%SFUC9h
zym}s`y<0o9AV0Ho4I(nKa-Um-vv0RLKI^rwetS|28(*GvjZt_SEV<C-<EM>Adv;lm
z6`hz7+hvl6g^Kn+xwUbh^JyODNTJKNMO-``&8q@>UY;jvr`y~!_~LN=c<Q@r4y@;7
z?RjHORz4VLeR-gOp68SsT-kg?DYDvErqhuVc0H5rTK$W?Y<xTy(s%CJuc)24Nu1Nl
z)FyW*T&~<@&Lo}foO)Wves7EJ;}Hh5x9il&ZF#y6WO>g7Tz51e_#uO3Q{u*T3+Q(q
zRJ>7vdfTF#XkT)rQZ4)B+0%X2A5RKO#7#_IKeSKL_Q^SS8z~j$R|dsHnuSrND|Ma=
zPFsYnX5;@FRT!07e9P}@pOf%6Pk*eqB`c-$(Zhpyd2GzLgPXXIN5o}yZ*|a4^6BEL
zJAE1vkyznA_)>En?lzRqws~Z)e8$mYLEny6K{xE6!TxQMfjszZ5&q7Y;}VRK)uHV>
zqOa^_kA<)zJJzMXa^~Pb_4qiIZ|s{ES2=CxJL2vYamQ(TfM4lJ5!y@8-8B(^_dEwD
zw8qNf+?bMx*pUTee70-qbd=ptU!h?8SkMhyFN1zZkJP={xee<L6T5qBRvM{H58fwU
zj5UCN5FC(gbS%$y4{xq36m0VMy3ZQ5&Vz5{@W#?N`&G~Ri@Utuz~S`(asQHXcx;~6
zL!fzWPMN8jah#$Oj=B7ZRkIjjc&CK-jVpI0`?@^*rHY$$uOD3Nn*4f*ui%i~5Qj`p
zmyL_p$wnqQjFP!#P^{z(Q~IMG$5jDUmNg6d0$-wX_TE$xFzXvevaU8A#_6uA8J@DO
zX)@nmJ>oB`@7~;KBJf~XUf{u-b%M3u{N3>%Hns?j>MDnC4fs5?E-L*R+rUNh(Zm7M
zgB0-t30L;&Wq(dw`^?28FChri(67ew?EYhZIW1Rgq4Bp8gl=!JS9kBlNlo01*3yz|
zScK{ZbD!l7&1^SKo4&G`va-FZ_XTTT?A7hlcMq>eVQXi$_C-Woc0rzdtBa;Dz24o1
z%=0?ZNHnq;#kFgWte0=DX_7rEpS)w^_0Hx&Vws+hk?HI0XPNmD&b{Nx&RLaq*w#;S
zXh<$0t;<%&KuC5O42v$+Y|p#~0G!kJ1u2nbl<Qs3N5dmLhAbP31;dy4T|c>D%Pwbo
z7sV_J|E2r3tlYeFw|(~h|FC@jT%<&f77^f)N|5S%t7H363tiTJC?e5jc9{L)eDnlQ
zQbSVX9cm~-gnA4zQe9I`Lme_&69XbD;TSSJ2or+E8!NoIa9IJ4MH?%4>o{sSMw(+n
zu{N8C823$19;i*>C<C;@8WT377{i!|$OsG>36F`u;Yo%u#tJmyh9FJNR#$-2SjgeV
z3bql*5R9RrWehghgFwK+H8s_=4HSS7B0AX6&BAJ41h_I*SQ6>ks6~tNfV;W|>KX`j
z1VR;XsFGswWMqsgo+JY#u)%3EEWqt-A~uqC+m9*}8APCvjTIEw;6JpBh;*agCMGRZ
z@Jldgw~|TfKrkF`1ll)O#?X@l^!LCJBS=)jT$QFcGVNmS3WuduWQarJLyQ$-RMB%c
zL={X-X~8PE!(5;W?u8+esJA9ToXSX@swfUSCy{nBFVaZ;cQr3j$r}^oPDYY35g0t#
zWC>>fAv(5H_A(IwNSY2ykOcih%K{xlO)hl!T(bcV|EnJ=(Esb7Kb8C|i2uO#2d;mG
zz`tVtGrIo3^{){4SImD#*B`k46$1Z?`Tx!6S~S%$cwnDz1cvzRuxgu+qYDHM{{7OT
z{fl`o4a|FKs(CN{JM&)p*XF(Sa`Rq#!MvBI-9&{0Ex_SBA_lIlhEPRmAT;2bYMKab
z4LyAoxCaFTcgI8m!yk^&(9nY;v<wlNhT0lGFqQ^3<u9B8=_Q8ke{u$>BL2=9kd~(P
z(Y&*Qj5Pis{FksTWkynBe$9*l{tV5B0vzf~O90<$-rM-wO6I+dr6tj*g{mScL>$fk
zL8H_$IGUkP0<~!_tI0N!jM4_~0u}g$lE4u{(MpoYX!WHWG-YWBEE5v><3PcJgk_j4
zkZHx2Y75%w==keGKitcRh-Fog$d=LMzb`@Zh>gUkyJ1M+7%2*484Vm9nWdGI$l%cD
zzYzi0mkA(agMU+=O8HA8slEK`>K6Kcsd^|P>DSySWCVtYR3#!es)F+qWN@5<+MOD6
z@Bp|B9SLY`aI6Jz>WrnS2P#xGbX7IAJ-}Si&^FZ2SJlun)X<<+MddapVgTn-ZXH#G
zz6V0XP+QXwp`nKOxqu^Z%F#$Na%qu;3bYJ$bbhM94N29}SXyU!l>{Qyg*Tp`^owUv
z9H{O!kwA!`v4a_5=#C*`kvJzxL=c8(EUl@D(9qM+G0@jvU~mA3H*E321Y>CfeRZ%h
z=xcy)4RsCb|7A?Z(w0_w8meIFh=_m(t0UC(9pJX^a9dlrr@JFu8AKCemhszK00eaq
z3wgBo!w*FkMO)#Jq)_VdaG(chECFvU4K!FNWrZb1Y(!G$6>!(pv}ySO`T3ZDBa#@7
z0jsD7k%IY&wA8U)7z@;6+5f>gr-_+g645BbU;;4$2__4c8a+`Di^PP`7?w_GLk9wC
zUh`$gY-o%N^VX0SDKM5cH~lH!oInB3BE%X?gQGY<ksL4~NK~w?i-)-dHUvWgY9KWA
z4G@|Z`c|4+I@$&n7Ft@m+NNgarUrVt7W$^zbKSaFCv}+3jZpy7+;Cn#Ks69^MF6CZ
zj)t~)5*Z23aZ|evtY>OiEZPuoXlQEcfh`1~p{uW{X`o|eX|AtfV5yDJw9=d(NOQ$4
z2q+3Q6!N1unp#}*9~XB9OEL9K)PF68x^fsgBE!L8F-PJFcp92>nFKTjOcz=%+|t<{
zu44hGjvX+17nx`S)EkQ?hl2U0qp$T71x%C>DhXkrJvVx3l6|OaB#tsSaKT19KXhp{
z-@l<Pl05NPYRA%Qqb_E&2;F>)3d{urVs0|blOhQu3K2s+^95$JIymsPSk66^LMCH~
z?vWS_+6#%J01jPUZ7qErT`C{-v&d`pV<KwLD@+q_8i^s2f%y5-%V?G{b5(=mX(2>p
zgt7D-KD2VwVMbNyM-TpbtSws%mz4vf8$2zri8_;iHAw$j@P{&HSR`p)*&oQ$1Un*Q
z{;n<Vl%OySifn<M8}7!^+MrVnboCGhI!oaIi#1q1@gZPO09ei~!8Gw!V8Y{mj0ftn
zxd^N|g+wMqxB=4;JQ4xgvjp=WO3#T~Lhug7k}+mT5Vu5udX^B}!O1#|IWm&kC)5pj
z8Ih)h3n+wHHU@QcHFZH(t7~fO7%Zx_$h>S&YUycfQ<)8P=9YoQ*3kt2%^-Eb#$a$h
z7NFDd)L`n88AFpnBl|8PFU%USH5)FBZe6uG=%|@sV4*N1(gICKO^>EOm9`uqQxe=A
zSW633TRe(LGtH1V4-D8yh)616Kft1vU&?{SgXuO0GL`hBS3sWH{0yOHyN3cxdn2$S
z7CFsmrXn8bxHK0$>Ov+WscZ8hr#n@FADh{Nnm{Bm^5^0X;8`p@wd36*2n2E{ZL?n#
zWDcI=AvzJTB#awo{!r-Bddx$K;Fu>Fi!uef`&@-?|AB6{l<tKM!2>G@V;Vu-gO*a}
zn(y%wRzL|G>awz^AjtW3W37o84E`r(THdeO&A@W?6E`*M*UVN}9FAt`EY-vd8$?_>
zfvBBm1I!^D)g*Gmpa{_z>L$CWx;YL>#FCd~fk&vQ^L<$hfmWvIFfgmBI~!>3QW48&
z&Y=3gDe8;C;RqXlTbhQ=Z>gqH6y$G-RG@xKbfFL<ala=!0;>kx$yr)_5%b@+`&TS~
zZT_#g{))n{xc&mhub6(u<X1dDL-Q-1zasQ2u3rGPFm->6(=Ryw3ezu`{)*BsnEnFN
zFL-{&=oc(ML-Y%lzasPtre6T$9*M(}JqUO(rRLU?pJw=9=!?KF8<2})7AExXB`vW0
zM`1thxYPy11qn<W44H^U{bK!JBw7H|aoHxYNTRJvzo9Lt_8a<KoitQ{Av9-iEZ52r
zSf>O$W}Zc7aWPv|V4;$ECcQ;DKt2(;S#C%)mI71&F59Ajd71_APqDyKUQ+u!#S%O?
z;D{uJ|FlE75J+TmA|dkkTZuIhJc#hu9fs<6f-OH7i^EvrkwMGXC@RqriKhT(0N7{*
zBGtV9s|XixBR3M*aoA`Kuo}QNhy<E1HfagjhCsw_0vq*j8Qcie`?#R=5=fSmcL$;Y
z^@q7l?G&)@gB=A7Z_vJ2@bm_iZiU2==KN492N?MnbMV+G#tDomV`=c@IR;5wum;R&
zk%)N&fNu>PbTk@+{x$uF`=_I=tD|A6rLAeEW2R$nZfdEot&OnIFw@pDH9(k|TP~Dd
zg04G;OaXy5YR>#4!lVT@8zc#kX<?8hPBc|{K%sW)&uucrfrtk>)-)2#$py!I?(X@b
zSN_wT`k!vq|MgzI^uoP*>A$&G|07KKo8M)(^5^fP|2Q51?wc=!41QA12>AHGdPIUj
zHg`*%76COwhRj|4P}XGed758U^n>3>{U>o$@pBQzCDMPWH6JQndTe1S6n|gk4<WQF
zmsCNmku>MuEUEH`f(uoe&>lZp-j;>NE<BL*8#)-Z^VaBZ80H>Y`W=z>7}M{Fv<I7h
zL!|nc%Sm%rKUzn_Vrk=zmc?mkkq`orYOy0xWNOfh7L8ucgS7+?PT{->#BgJ2s&$RU
ztA$Wv*G3>w)Dt_jnFIf+gejV6PK)4J(Jatk@^}*GWiE-PgJ;UI1PV!&HvWLeLJb#7
ztJ8YTXfC2+LtFh~mvp2%CTi~LM`z97^q|Fb4MDSL&KL<9J-?KI*)m7M{wlWfPl7WG
z5;lfnfS>nMP*lrMQ+G+sa)Fsd2qshGcBWMO@~?qPb9WsOfI$KO0z5=F2iOlqQK3{j
z8ra$D^H?m5*<UslHMb7`+}y~yogC~C#?rx{AK`NWJZfA9PA1G>(ZYFifd73Zz?lb|
z%-rI<(8Q%xENB7$pI7!zJMW(a<`$Iw|JHePGxW!>rLDvu(ztYB&yRJBIgG79XVE&E
zc8kIAzaO@9<<b9bOcG2RaL>XJ7!Ln^P;!1Q(;_0a?#{Hx++0L|?hM=99R7jL!Vok8
zG4|z0)8_ZHADl+&zZGdT7s8<i)oCcsU1EvU3AJdRz-ifTz%n3G<Lz@3kd`+WoSKV9
z&T&~$@bjz6U(2H{V=;3j=4kT`US|FL-Qs1Up#uM@r9aj+6NHYA3LJd>YQbLw;xARr
zu`fG8H;>+*BXnRj_#b@cm*4+^gnv-<PbL2Vq(zoLa4ll-4^n^N`UfB_viyN-5sQD2
z`UBTL0BMos4_u2_{DagVxc&i1i!6WOTEyZXr2fG54?tRE`2*J?7XKji2d;kr(jv<r
zxE8Va2dV!SF1F=IxurLPL)YN_Q|1soc!v}C10M$P$H)TSe#F4Y#>~vb!okMD!Oq6c
z&dJ5c!^y?V#m>$n#KX%kASfuv!7VHzBp|{kASgf;0;8wC!-|oWk&#t^lbuuGUw`J_
zLA4E<T=EX8W=I^oBa3m#yQjeOrr`BVv=>axHbbU75DaL}$O>NH$pBup1&GwwPw_HJ
zG4W}-rZV#jNSh*~cBUcB+*kyKWZa4AC#pJ!S%Xl*TDz~xnpXo6;xOu4uc#l|qpUO;
zixp^r_d&tvs4u)?q-UICpuNKiNN1EXMW*r#oRIEh5(M&tq9%8yRb3rk{x+sBUMc<R
zPb_`Dtv^w3i#z0?d^Es3IDNIc)e+RK5`5>*w2z8C_2ZtwjjM(4-Yto=In%0+&$#I)
zi(OwR@0xFVjQAosF|n(GU&-*3H+{w+-5CaG2M-;zmIVgEK~lh<m9lOpdxqWyjftVE
zj0BtTy!w-?g}PCBbxIy;sr*M9+cR+i(h7}?<2@AtGS?Ktbk&<LqCSY7(F=XjSGylS
zamY=6T%dmMW4rqCo`lQRYNng(Hch0v$rrl$tDijKGnA%M^J)FK(sf6^s*d}`9=Fn%
z)$Ih;Tu%%={uB_E<9c7_BCgPKFPC31JOBe<S6atjS|_LmbG#x4{v|{TyG9Dz?`TNc
zd9wXHo&T}%;3tl8X+~a%92x)d4#QHRsuf2YpJyf&TFeM%dh-r8Sg2>l^i-{)Xxr?Z
znyKWgRj)sl@a_W>9C2%#YtFILz4^D}QZ5#?KX;f?atnSX7}`d;cWNZo6Dz?e7}K`t
zeRv<p*Tp`+w(B#S$OTFAv%U-B_umAXnhTKh({(*xxi#l#+w}{VIrF&YTiv)Yyif7&
zTj`hk$?fA3l^5}+^2LNk8&y5cR8+t8CY}%yn%H!{L`AH{iL9b}d+fG~RFp&_DT%3S
zu)q*T%xT%}GZ0o;q9XUD+i+Ktzsf^1oP6zg@~M2B&K>`*3cqH2YLqjNue6@+qsHgi
z`OjsYb31O7CA|*KUpuq;enOz=V5i02cN;5@RqlTsmhY8zoNN4DUy2mIsA}g_){4Sc
zkwS8wL$U`RK1X`IHw@#H#nxiH`)ws1{rL^qRHc{(JTDelr@AxUdSEPDQ=$H(W<RU7
zd3)(D-KXy}i~1|tqcWTkMXZO(4QBVDi-w-E2M{q<`}L!;R)>8k4U$a}Mdqrt?9+T$
z)>E9c)hWa>|C&<n>$?|~V$Lcs*~v54Y%~`L9<h-Ph-wjRSIo$~CvGbwF6UQnuZ*-v
z@=TCX63%OAXih$HTUo`XU0uI;@I;1Fl<}2z@sZ6tGYnd+_la5{R35<(b502HHS;5j
zEIU+8!#T)FDKTm7viL*9cc+5v`}R(~QEn?sd>vr1%P#JGO-xPI)>|H;PB_!l$2#w(
zlh+xdY|k1Nh=vo6J-HNpNgDSuPV}sNnT^=M1VLxWyHtMTHJ1L#@51epd=J;%QW(DQ
zG4N8yE|g^Idhfw+&hNHxznk8UD!*25)x>qWD1Gwb7nPNC*S8CfZ@oFuqT$}Po%<#E
zocIZ(1-re}EVTb|b=#y$$lLX<Ek^6bHaQO;VU#?Itf0G-e)mnk`;^1_j&}WVCAY3X
zj=_R^{>Hs$k3CabBj2Ky)NX)rLUdWZ63TJKM3Bb3lJ<;vTaJrsHPwf9*4q|&?BOb#
z7CaXdEJa@LBswJjKD4*E>$5#q`B8u=BjtR0;ue#Nr=9WkB~#Dao+;<+8+Ld!<`IW`
zHVaF4JurU_@{08RI*QwFsjc*`3NuzIc&JcVvDfU>v#AY}f}8pE>`LySk7hQU^d!${
z#juqHnVuAge`U;W$(B^y7KrgapL)#}%l%-JSE7#YjMAj%W-c*nn{D^HDl$IG^n1Qk
z?@|h!+9dF8v*1UH<!4L#@6Kk&%8)OgGk1wOzIm^3|I9}U<7ac*i{JM&*2+Ba;CaTW
z_{G^QZlcQMcFDa$@@`O*-r=A}w~ME*ueL2^ey~Z{=<G}14W~X%S-eszkVyM1tX<$9
z^n%{|d>ZpJ3eN+%uWQDMPJ)52tjgkhUyW7D=enGIcxZAK%Dn2fKje#dy3gc;I|R8^
z=brDq{CONO$JS_MCjjV5CL0DS<s+;W1*B&oZ}ozi^%y6KghQ5Nui{xxH%y^Dr{d$2
z9vN)so>@<xHc<-@PHzyGukNXomk3$q6RsX@KaGjJGx<^1Z(Z8}*9x8T)H^}qCCJ@=
zuMTc+_LiN6*iqy8fv>H%XoMNwoF;Kc-@Z^+`K)Xuf?P+sa^82)!$+q0+IZ;sfI%;!
zwT06m?(7wmhb<dA?@MqU;yxVWJLnZ5q3LaC$4Zn4iSpG!*{^s{LL0Uwo=(E(mWI?c
zydKGKLF68E{??l4Q;-n7>LVqw+F+ckrN{#^E@-i{Qj<u?@i0+{@<x!`)_IvA3UA%p
z%vXE5_G5cm%Hh74@`!I|TWq}@U#=<A8#QvNEcz&MZ^hfAN^GAA$W7tfv|6mCo?YBs
zbneSUVv2d!X4ZS_0I{O^Ga*RN3l#8VS0V(hQl^&JF9wq3HT&;W#FXdi?boYv3hRA5
zVC3ayZGkmT{+!r(%>S)V-I0Su9}%a*bJah@C$_a#^^1tq)Qqk<y;1O}XH|n0<JKs>
z&l7LmQ*oxZf^_1k`Gv^7!knAlo+jSB;?*|M{W;&0FpO2V2cF)^K9k~l#%~u?!Leo>
zm9rfo+;8YeHgWY>cLXn5REO^EDNhc0vuohH-KE0{hK9+j?LyZN_4Ztukh}`_B;OL4
zIug7xxsOh3MN?Z>{XMaPBb;1@YO3e!gP$I8J$<(~I@fg=$6Z#In2k^ERk#viB)FC7
zy$)q`W%o<3V~50*lFFPJ9XDT+KWA}U?dGJHkF9a6NQVSte!Y00qV4XuB6iV;cfDnL
zv(Rv0zv_36qia5I+dlbpm5Ix={b6iq*yuryzJ3`><Lfn+$Ihnd_&gwZ+{z8ikW8vC
zp9m{1BGuN~u-9y{C(I~)u{$jEi5%$GH)9r>1nX@M7J4Z_JUs2Qt=2i*J*bl3eEW>L
zJMrC#5AwHKc00zOcUC4meEG^VW>eA$r5aJJO#bn4eum}(_2L%AM|W|QA`T;opps{8
zVf*=#I&)Dr&m>mJ3i1dU#npU$hZ~882sy7^@~?Y#pBuE`-_Ye8jSWvf=$x0U`(X>w
zJu@{G);zGa;O5DF?eXL<`;X-&@u#xhdsvq`SfF@g-+0Rk9wzH*jcDOUZAqmHxoVjs
zEi*1x&LlK*H*Y8@IYT;eGPT-Zf4$i4+gJQ~!w38NRtPGkhZc7oNvq%YecdE9$x;z2
zqeqThyZU0;G1>RBf!eP0u@Rj!=*|AmZ}{mNzi*C@rL%d*R>_TcUe5Mm%el~(ju*m|
z<T?h6wtwq)A8@?LX}l@CG}E^Of8ZRSZ288>qBS2qw-)wGKF@tI88q_s{Ez@S_~evl
znBT;DE*!UTV_b^j84|v^5u;r>3t8{M-uVE#>nNIKx5>`$>!#A82N{UgTlA0BBHq7H
zD~YV{@J6+rZk_CoRc`zE<><<ymEG%X-ukg+YjBF3xT>@=!!uJW7rcA!oJLK#{J>Ru
z;>&opqGLVs-?@d(kJwcwc^p3!{pRh7YmQSB<7P1m`+G#J8V~j4)S;1`0kvWmbHrP&
z>ODfNQ(F<gZbm<F<#p}*>dZOMR;oVOe6m~qfN<BKUv0*XXAbJ6k=Ur(yQ+~YDqQAg
z82dSNL{?u{e5dr5!xNK5SrIsRn5*@zmp-r0l<JwCgwBnal-5#Fy9Y;{RuqXeiudDE
z(>ihe=@;&7e_i&hx!=j^w#3Q0_mS^V0@=GC40R0;*)*V2S~AA#E90IC>2c&+p#<Ny
zy+xcH`fh2zM^`29ykSFtVOPAxjTGbcAGLj$9Z9ucoVIu(%u$xB@cv2SElQl@6-QpL
z4mh3jR?5kzV$Z{@VRR1zsoKQ3al}3Cu2@EQG*sg@mP?*&^lRRwr<7%tteWA&PZ8f4
zksS4LZ#Uoi-EgLDcICn=${{sMd~p4@9$UGI(gR<rO%H|V-NT4?sBJog)f95SvC?_{
zjl!3j-El|Z4_ymCSfxgU-fD0(Yz}2A(B72~H#~V!BlS=)Ciq$L-KYDp>VpKAsbk44
z4zCHKq>-rl&Es5EZw*qEg>5C+E_7F_D+%(Z1-Ik|Zn<MinT4baIxp?{a^$7y8YRt(
zC+@T;t^fFhUh>mQm3y6=`QB;{PDEYukP1JMWiwG0pU0W&J1)GxkT<H_`6BY@2a3gY
zpTY+5@505CckDXF@w<x7&O*AeXp-d9f~_+}sb}i6T=PHCdp19=eVvmWeu4Pn&evJU
z?A7`sog9ayn7^!5NV$^8cx2tv5c{I2`m4LV;}817WP<Yck}lpc>AI7ld*JD)B$MKx
zU1=qUb~fp-%I;W&KA|u7UwV72drG_`=p=#vBDtnLuzg!?qsalw`Uk<OAtMwOI{e!e
zS{z@lPeiWp>MYDEKD@8>@;&QA+pC5}E*b0_C6Vf~q&)Z8Io`~4Z*brGDN31~c6Tz&
z$^Bcz<=4TP3R=7@z%O|E^i)y!&ij`!N3z$+JWL8PHQi^|r6ywa!k24L|J|-2tENtE
z$te%9!N>V6Yo#aIqd#Q$Gytx|=JoUiQitD=u9|K>A}Azhd$3pf%LAgP%Kqm{r?AF3
zB2L3Ko>^As1YOSfT-f0n)N(zDmvg_ul*btr>x6S0+3JtR&eXk4yfLD)Zbd{RKlzN{
z^j`D$FZpX4RPwJ}Yt?+IM^90>?HRGZ$8BHk`bnFC`+9mk46v<Z%5qy-i1zMG=QFqR
zUOSm4<tv9yJ;-{pnAAtAI$O;&u%)^oFAXDMlV2g#A)kEDVw9mq=Ku#O_eN<4j8ctN
ztEsI1sOyl1?A<q0kM6XKJuGtc<OF=8)nP*O!fL#l)&p3d2RhZH+^bk7<?HbP`vdI{
z*!06Ai<(!6l#)(l*>a}T4+QUyT!H)eFu=|0Nr;N&F;$ky+kwSdHOKTfyw5*``mAyQ
zalSF!e<eLZfc!B?KYm+y>P7dCOY}U(E4eC5bUOmd_XS4XJf`Dp=g>JK(<zB9YAi!N
zu(yD77GDcWHW<&?G}O@(X?R<$9?MmGx*W&W>F%ok{C-}3PqNRs$M#3;9hi)Lde1P|
zblTraqpZEK52}06^kfEFO;^1qdKFs@qO#;^Nj;`3%*fzek1<=#OQ8r)bN^@i-t@rr
zKOHQ2R&=XZ8ta>PDSawF8I`?7WXstsH>)eHx(L&}uWk|*#sjM}M;YpKoX(Avzt`^<
zA8P9CS+VPaweprkEsk2Hz9*?pLAqc<kCuGqRn(xmnJYB9byxF6jMO-Ml+muyEqTuP
zG9t2^B9HIv*1ht0*KUv3c-L-@v#zD&*AZ^c;lWudM{b3M9UlnjeQPi5bp6on$S(8S
z9**L?2ex^~rN~((1yJC#kcY-5q19eB_flV9<3F;U4kv)Aw{|mT-hSH0-&gl&_4W%Z
zL_gPCnHh&>mKl&ki(^hS4ffwSD_fc^biT1Bf1+vFZtsl`zB^v~kh5%OZXXj52w0Cd
zj1G&q_|o*wMdzX%Yqxa=ZQFY@=ss<EZcCz&;<U;hb(U?|+;dSs{kc6U?Nqbe>7%yK
z<<s(G#r<dGqDXm8=rqqXE8l(n2Ag*X>%C+}*GP}=T)k@G!`{k`*TM&GS=K5O%cm1I
z+xv)JiH_T=E39NN_{n2Xdo1EXmee=DgXa5cS!DL+R%B2Dzh%k#4_phXL@}D!DW-N^
z_Bcwey8ViS6TYgd;9^CN*Cne~Q+<i>sz;;#(Y%}UzIN-}xLvGhlPl_XT`%A!0)sr|
zXB9Bc$BQK*Ws92gZjV;6KPG0hd{UF2sJD6Teq{XkIPrM9TlHAbC2ylNf5%>hjIqbA
zg=u)lc0v5-T|CsVfPnbxJw?uf{;7OV8h1aypIj}$TPAmVydCG4pC@5!j|ap0dD{`*
z@>iwBjwf|Acd<Vh**c=dh9_UY@EmJd<bLHEQC6;&?j!WZ%j!~1oO6*+rb~|?6VuCc
zzWft4>zfTvXWSw^iEcbVPMJPBGTL0`D|oYCIo#=e6>fkpv16c0MT-w{Y7}pWa|&|G
z9N4xhh{Q=T)w`ozwQex<V93URwHNp5Y&zW&vBRGIU~aWXU-JDGw;yYtS)n}mvb>Ay
zVfgn%QD5EmyJ^b7s*$%&NBahb_K&U3G|W-&ZBxjoJ9z)YYQy?6zb6%6az0c<r37I8
z*PX(NcZR=ia|6r#=G9dWZ^#>jto)$%iRckt`E}Z-^Of%;m?(bmnT5(n2|8Y{Zd|A2
zd8R*c!8oM0RfrQdA3jpHIxn#>{bH-Fx61KdFH^ke+M*p!wfpC=?S}sdweYZs7mW?3
zR(ff>Ny_UzD9_2yQ4Z;O<5i!3B*D_j?!LCW#pzR*x;!2px<mBp4#^oRcM5h;x<WUj
zEOgVzbC>Q3gB?9d$*&&m31;?!9qik!aXYj3mMPcTuyV(8Gu~`-51SiYit1Y#aJ4T?
zLJs-$ZV>t=7@IV37_&VOD&3qQ|B~Lf=?m-4v9nG$TRhGUNFU?n)V(!P+rNr*<_Jb|
z+_!8j^JKlY#K3u#yaA0&tgR19=}~70-`jptl|ZhtSoOa9_T}HU#y34b{jT0y`9f+s
z@%YUpkt7~En5kQ~fMEEZmx@vD#OLO_yR)3e_8&YTh`uEdpKxATex1gXn@oeZ$I+kU
zY&IH4oliXcK{YS@1-;Y2v{J*qf|7&e)Y@l9IG(O>xsTS(PkU;YyXBzR{(z!~C1d+;
zMOen2tmf0HiO&1tv8qVWVumy8<c_}e0~vOqc32{u{B6U~YSo~##OKL*GY@&viFP+z
zT^5jEjCb)sx@%S6c~PTG!hTmB+v>uPws@;1T;TWVOM2xRZP|B7w`R&kjb$yI{Wt@x
X3gRa&jg~EI?m`Uh|3dD{+5Z0nqhv%J

diff --git a/tests/CanvasCompare/res/layout/automatic_layout.xml b/tests/CanvasCompare/res/layout/automatic_layout.xml
deleted file mode 100644
index e049ec0a50007..0000000000000
--- a/tests/CanvasCompare/res/layout/automatic_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <com.android.test.hwuicompare.MainView
-        android:id="@+id/hardware_view"
-        android:layout_width="@dimen/layer_width"
-        android:layout_height="@dimen/layer_width" />
-
-    <ImageView
-        android:id="@+id/software_image_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true" />
-
-    <ImageView
-        android:id="@+id/hardware_image_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true" />
-
-</RelativeLayout>
diff --git a/tests/CanvasCompare/res/layout/manual_layout.xml b/tests/CanvasCompare/res/layout/manual_layout.xml
deleted file mode 100644
index 1a9288ce1993c..0000000000000
--- a/tests/CanvasCompare/res/layout/manual_layout.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical" >
-
-    <HorizontalScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-
-        <LinearLayout
-            android:id="@+id/spinner_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" />
-    </HorizontalScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:baselineAligned="true"
-        android:orientation="horizontal" >
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="horizontal" >
-
-            <com.android.test.hwuicompare.MainView
-                android:id="@+id/hardware_view"
-                android:layout_width="@dimen/layer_width"
-                android:layout_height="@dimen/layer_width" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="horizontal" >
-
-            <com.android.test.hwuicompare.MainView
-                android:id="@+id/software_view"
-                android:layout_width="@dimen/layer_width"
-                android:layout_height="@dimen/layer_width" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/compare_image_view"
-        android:layout_width="@dimen/layer_width_double"
-        android:layout_height="@dimen/layer_height_double"
-        android:filter="false" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal" >
-
-        <ImageButton
-            android:id="@+id/previous"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/previous_combination"
-            android:src="@android:drawable/ic_media_previous" />
-
-        <ImageButton
-            android:id="@+id/next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/next_combination"
-            android:src="@android:drawable/ic_media_next" />
-
-        <TextView
-            android:id="@+id/current_error"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <Button
-            android:id="@+id/show_hardware_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/show_hardware_version" />
-
-        <Button
-            android:id="@+id/show_software_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/show_software_version" />
-
-        <Button
-            android:id="@+id/show_error_heatmap"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/show_error_heatmap" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/tests/CanvasCompare/res/values/strings.xml b/tests/CanvasCompare/res/values/strings.xml
deleted file mode 100644
index edd46103f4f56..0000000000000
--- a/tests/CanvasCompare/res/values/strings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string name="app_name">Canvas Compare Test</string>
-
-    <!-- show hardware rendered version of the layer -->
-    <string name="show_hardware_version">Hardware</string>
-    <!-- show software rendered version of the layer -->
-    <string name="show_software_version">Software</string>
-    <!-- show layer error -->
-    <string name="show_error_values">Error</string>
-    <!-- show layer error heatmap -->
-    <string name="show_error_heatmap">Heatmap</string>
-    <!--  select and display the next combination of painting options-->
-    <string name="next_combination">Next Combination</string>
-    <!--  select and display the previous combination of painting options-->
-    <string name="previous_combination">Previous Combination</string>
-</resources>
diff --git a/tests/CanvasCompare/res/values/values.xml b/tests/CanvasCompare/res/values/values.xml
deleted file mode 100644
index f69378d34f652..0000000000000
--- a/tests/CanvasCompare/res/values/values.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-
-    <!-- NOTE: the below MUST be multiples of 64 -->
-    <dimen name="layer_height">320px</dimen>
-    <dimen name="layer_width">320px</dimen>
-
-    <dimen name="layer_height_double">640px</dimen>
-    <dimen name="layer_width_double">640px</dimen>
-
-</resources>
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/AutomaticActivity.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/AutomaticActivity.java
deleted file mode 100644
index 8ccd4e2181ed9..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/AutomaticActivity.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.TreeSet;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Trace;
-import android.util.Log;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-public class AutomaticActivity extends CompareActivity {
-    private static final String LOG_TAG = "AutomaticActivity";
-    private static final float ERROR_DISPLAY_THRESHOLD = 0.01f;
-    protected static final boolean DRAW_BITMAPS = false;
-
-    /**
-     * Threshold of error change required to consider a test regressed/improved
-     */
-    private static final float ERROR_CHANGE_THRESHOLD = 0.001f;
-
-    private static final float[] ERROR_CUTOFFS = {
-            0, 0.005f, 0.01f, 0.02f, 0.05f, 0.1f, 0.25f, 0.5f, 1f, 2f
-    };
-
-    private final float[] mErrorRates = new float[ERROR_CUTOFFS.length];
-    private float mTotalTests = 0;
-    private float mTotalError = 0;
-    private int mTestsRegressed = 0;
-    private int mTestsImproved = 0;
-
-    private ImageView mSoftwareImageView = null;
-    private ImageView mHardwareImageView = null;
-
-
-    public abstract static class FinalCallback {
-        abstract void report(String name, float value);
-        void complete() {};
-    }
-
-    private final ArrayList<FinalCallback> mFinalCallbacks = new ArrayList<FinalCallback>();
-
-    Runnable mRunnable = new Runnable() {
-        @Override
-        public void run() {
-            loadBitmaps();
-            if (mSoftwareBitmap == null || mHardwareBitmap == null) {
-                Log.e(LOG_TAG, "bitmap is null");
-                return;
-            }
-
-            if (DRAW_BITMAPS) {
-                mSoftwareImageView.setImageBitmap(mSoftwareBitmap);
-                mHardwareImageView.setImageBitmap(mHardwareBitmap);
-            }
-
-            Trace.traceBegin(Trace.TRACE_TAG_ALWAYS, "calculateError");
-            float error = mErrorCalculator.calcErrorRS(mSoftwareBitmap, mHardwareBitmap);
-            Trace.traceEnd(Trace.TRACE_TAG_ALWAYS);
-
-            final String[] modifierNames = DisplayModifier.getLastAppliedModifications();
-            handleError(modifierNames, error);
-
-            if (DisplayModifier.step()) {
-                finishTest();
-            } else {
-                mHardwareView.invalidate();
-                if (DRAW_BITMAPS) {
-                    mSoftwareImageView.invalidate();
-                    mHardwareImageView.invalidate();
-                }
-            }
-            mHandler.removeCallbacks(mRunnable);
-        }
-    };
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mHandler.removeCallbacks(mRunnable);
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.automatic_layout);
-
-        mSoftwareImageView = findViewById(R.id.software_image_view);
-        mHardwareImageView = findViewById(R.id.hardware_image_view);
-
-        onCreateCommon(mRunnable);
-        beginTest();
-    }
-
-    private static class TestResult {
-        TestResult(String label, float error) {
-            mLabel = label;
-            mTotalError = error;
-            mCount = 1;
-        }
-        public void addInto(float error) {
-            mTotalError += error;
-            mCount++;
-        }
-        public float getAverage() {
-            return mTotalError / mCount;
-        }
-        final String mLabel;
-        float mTotalError;
-        int mCount;
-    }
-
-    JSONObject mOutputJson = null;
-    JSONObject mInputJson = null;
-    final HashMap<String, TestResult> mModifierResults = new HashMap<String, TestResult>();
-    final HashMap<String, TestResult> mIndividualResults = new HashMap<String, TestResult>();
-    final HashMap<String, TestResult> mModifierDiffResults = new HashMap<String, TestResult>();
-    final HashMap<String, TestResult> mIndividualDiffResults = new HashMap<String, TestResult>();
-    private void beginTest() {
-        mFinalCallbacks.add(new FinalCallback() {
-            @Override
-            void report(String name, float value) {
-                Log.d(LOG_TAG, name + " " + value);
-            };
-        });
-
-        File inputFile = new File(Environment.getExternalStorageDirectory(),
-                "CanvasCompareInput.json");
-        if (inputFile.exists() && inputFile.canRead() && inputFile.length() > 0) {
-            try {
-                FileInputStream inputStream = new FileInputStream(inputFile);
-                Log.d(LOG_TAG, "Parsing input file...");
-                StringBuffer content = new StringBuffer((int)inputFile.length());
-                byte[] buffer = new byte[1024];
-                while (inputStream.read(buffer) != -1) {
-                    content.append(new String(buffer));
-                }
-                mInputJson = new JSONObject(content.toString());
-                inputStream.close();
-                Log.d(LOG_TAG, "Parsed input file with " + mInputJson.length() + " entries");
-            } catch (JSONException e) {
-                Log.e(LOG_TAG, "error parsing input json", e);
-            } catch (IOException e) {
-                Log.e(LOG_TAG, "error reading input json from sd", e);
-            }
-        }
-
-        mOutputJson = new JSONObject();
-    }
-
-    private static void logTestResultHash(String label, HashMap<String, TestResult> map) {
-        Log.d(LOG_TAG, "---------------");
-        Log.d(LOG_TAG, label + ":");
-        Log.d(LOG_TAG, "---------------");
-        TreeSet<TestResult> set = new TreeSet<TestResult>(new Comparator<TestResult>() {
-            @Override
-            public int compare(TestResult lhs, TestResult rhs) {
-                if (lhs == rhs) return 0; // don't need to worry about complex equality
-
-                int cmp = Float.compare(lhs.getAverage(), rhs.getAverage());
-                if (cmp != 0) {
-                    return cmp;
-                }
-                return lhs.mLabel.compareTo(rhs.mLabel);
-            }
-        });
-
-        for (TestResult t : map.values()) {
-            set.add(t);
-        }
-
-        for (TestResult t : set.descendingSet()) {
-            if (Math.abs(t.getAverage()) > ERROR_DISPLAY_THRESHOLD) {
-                Log.d(LOG_TAG, String.format("%2.4f : %s", t.getAverage(), t.mLabel));
-            }
-        }
-        Log.d(LOG_TAG, "");
-    }
-
-    private void finishTest() {
-        for (FinalCallback c : mFinalCallbacks) {
-            c.report("averageError", (mTotalError / mTotalTests));
-            for (int i = 1; i < ERROR_CUTOFFS.length; i++) {
-                c.report(String.format("tests with error over %1.3f", ERROR_CUTOFFS[i]),
-                        mErrorRates[i]);
-            }
-            if (mInputJson != null) {
-                c.report("tests regressed", mTestsRegressed);
-                c.report("tests improved", mTestsImproved);
-            }
-            c.complete();
-        }
-
-        try {
-            if (mOutputJson != null) {
-                String outputString = mOutputJson.toString(4);
-                File outputFile = new File(Environment.getExternalStorageDirectory(),
-                        "CanvasCompareOutput.json");
-                FileOutputStream outputStream = new FileOutputStream(outputFile);
-                outputStream.write(outputString.getBytes());
-                outputStream.close();
-                Log.d(LOG_TAG, "Saved output file with " + mOutputJson.length() + " entries");
-            }
-        } catch (JSONException e) {
-            Log.e(LOG_TAG, "error during JSON stringify", e);
-        } catch (IOException e) {
-            Log.e(LOG_TAG, "error storing JSON output on sd", e);
-        }
-
-        logTestResultHash("Modifier change vs previous", mModifierDiffResults);
-        logTestResultHash("Invidual test change vs previous", mIndividualDiffResults);
-        logTestResultHash("Modifier average test results", mModifierResults);
-        logTestResultHash("Individual test results", mIndividualResults);
-
-        Toast.makeText(getApplicationContext(), "done!", Toast.LENGTH_SHORT).show();
-        finish();
-    }
-
-    /**
-     * Inserts the error value into all TestResult objects, associated with each of its modifiers
-     */
-    private static void addForAllModifiers(String fullName, float error, String[] modifierNames,
-            HashMap<String, TestResult> modifierResults) {
-        for (String modifierName : modifierNames) {
-            TestResult r = modifierResults.get(fullName);
-            if (r == null) {
-                modifierResults.put(modifierName, new TestResult(modifierName, error));
-            } else {
-                r.addInto(error);
-            }
-        }
-    }
-
-    private void handleError(final String[] modifierNames, final float error) {
-        String fullName = "";
-        for (String s : modifierNames) {
-            fullName = fullName.concat("." + s);
-        }
-        fullName = fullName.substring(1);
-
-        float deltaError = 0;
-        if (mInputJson != null) {
-            try {
-                deltaError = error - (float)mInputJson.getDouble(fullName);
-            } catch (JSONException e) {
-                Log.w(LOG_TAG, "Warning: unable to read from input json", e);
-            }
-            if (deltaError > ERROR_CHANGE_THRESHOLD) mTestsRegressed++;
-            if (deltaError < -ERROR_CHANGE_THRESHOLD) mTestsImproved++;
-            mIndividualDiffResults.put(fullName, new TestResult(fullName, deltaError));
-            addForAllModifiers(fullName, deltaError, modifierNames, mModifierDiffResults);
-        }
-
-        mIndividualResults.put(fullName, new TestResult(fullName, error));
-        addForAllModifiers(fullName, error, modifierNames, mModifierResults);
-
-        try {
-            if (mOutputJson != null) {
-                mOutputJson.put(fullName, error);
-            }
-        } catch (JSONException e) {
-            Log.e(LOG_TAG, "exception during JSON recording", e);
-            mOutputJson = null;
-        }
-
-        for (int i = 0; i < ERROR_CUTOFFS.length; i++) {
-            if (error <= ERROR_CUTOFFS[i]) break;
-            mErrorRates[i]++;
-        }
-        mTotalError += error;
-        mTotalTests++;
-    }
-
-    @Override
-    protected boolean forceRecreateBitmaps() {
-        // disable, unless needed for drawing into imageviews
-        return DRAW_BITMAPS;
-    }
-
-    // FOR TESTING
-    public void setFinalCallback(FinalCallback c) {
-        mFinalCallbacks.add(c);
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/CompareActivity.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/CompareActivity.java
deleted file mode 100644
index 0dec1de79a465..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/CompareActivity.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.android.test.hwuicompare.R;
-
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Handler;
-import android.os.Trace;
-import android.util.Log;
-import android.view.View;
-
-abstract public class CompareActivity extends Activity {
-    private static final String LOG_TAG = "CompareActivity";
-
-    protected MainView mHardwareView = null;
-
-    protected Bitmap mSoftwareBitmap;
-    protected Bitmap mHardwareBitmap;
-
-    protected ErrorCalculator mErrorCalculator;
-
-    protected Handler mHandler;
-
-    Runnable mDrawCallback = null;
-    protected boolean mRedrewFlag = true;
-
-    protected void onCreateCommon(final Runnable postDrawCallback) {
-        mDrawCallback = new Runnable() {
-            @Override
-            public void run() {
-                mRedrewFlag = true;
-                mHandler.post(postDrawCallback);
-            };
-        };
-        getWindow().setBackgroundDrawable(new ColorDrawable(0xffefefef));
-        ResourceModifiers.init(getResources());
-
-        mHardwareView = findViewById(R.id.hardware_view);
-        mHardwareView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-        mHardwareView.setBackgroundColor(Color.WHITE);
-        mHardwareView.addDrawCallback(mDrawCallback);
-
-        int width = getResources().getDimensionPixelSize(R.dimen.layer_width);
-        int height = getResources().getDimensionPixelSize(R.dimen.layer_height);
-        mSoftwareBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        mHardwareBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
-        mErrorCalculator = new ErrorCalculator(getApplicationContext(), getResources());
-
-        mHandler = new Handler();
-    }
-
-    protected abstract boolean forceRecreateBitmaps();
-
-    protected void loadBitmaps() {
-        Trace.traceBegin(Trace.TRACE_TAG_ALWAYS, "loadBitmaps");
-        if (forceRecreateBitmaps()) {
-            int width = mSoftwareBitmap.getWidth();
-            int height = mSoftwareBitmap.getHeight();
-
-            mSoftwareBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-            mHardwareBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        }
-
-        Trace.traceBegin(Trace.TRACE_TAG_ALWAYS, "softwareDraw");
-        mHardwareView.draw(new Canvas(mSoftwareBitmap));
-        Trace.traceEnd(Trace.TRACE_TAG_ALWAYS);
-
-        try {
-            Method getHardwareLayer = View.class.getDeclaredMethod("getHardwareLayer");
-            if (!getHardwareLayer.isAccessible())
-                getHardwareLayer.setAccessible(true);
-            Object hardwareLayer = getHardwareLayer.invoke(mHardwareView);
-            if (hardwareLayer == null) {
-                Log.d(LOG_TAG, "failure to access hardware layer");
-                return;
-            }
-            Method copyInto = hardwareLayer.getClass()
-                    .getDeclaredMethod("copyInto", Bitmap.class);
-            if (!copyInto.isAccessible())
-                copyInto.setAccessible(true);
-
-            Trace.traceBegin(Trace.TRACE_TAG_ALWAYS, "copyInto");
-            boolean success = (Boolean) copyInto.invoke(hardwareLayer, mHardwareBitmap);
-            Trace.traceEnd(Trace.TRACE_TAG_ALWAYS);
-            if (!success) {
-                Log.d(LOG_TAG, "failure to copy hardware layer into bitmap");
-            }
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        Trace.traceEnd(Trace.TRACE_TAG_ALWAYS);
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java
deleted file mode 100644
index 4bcf5a4e30d58..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import static java.util.Map.entry;
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.util.Log;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-public abstract class DisplayModifier {
-
-    // automated tests ignore any combination of operations that don't together return TOTAL_MASK
-    protected final static int TOTAL_MASK = 0x1F;
-
-    // if we're filling, ensure we're not also sweeping over stroke parameters
-    protected final static int SWEEP_STROKE_WIDTH_BIT = 0x1 << 0;
-    protected final static int SWEEP_STROKE_CAP_BIT = 0x1 << 1;
-    protected final static int SWEEP_STROKE_JOIN_BIT = 0x1 << 2;
-
-    protected final static int SWEEP_SHADER_BIT = 0x1 << 3; // only allow non-simple shaders to use rectangle drawing
-    protected final static int SWEEP_TRANSFORM_BIT = 0x1 << 4; // only sweep over specified transforms
-
-    abstract public void modifyDrawing(Paint paint, Canvas canvas);
-    protected int mask() { return 0x0; };
-
-    private static final RectF gRect = new RectF(0, 0, 200, 175);
-    private static final float[] gPts = new float[] {
-            0, 100, 100, 0, 100, 200, 200, 100
-    };
-
-    private static final int NUM_PARALLEL_LINES = 24;
-    private static final float[] gTriPts = new float[] {
-        75, 0, 130, 130, 130, 130, 0, 130, 0, 130, 75, 0
-    };
-    private static final float[] gLinePts = new float[NUM_PARALLEL_LINES * 8 + gTriPts.length];
-    static {
-        int index;
-        for (index = 0; index < gTriPts.length; index++) {
-            gLinePts[index] = gTriPts[index];
-        }
-        float val = 0;
-        for (int i = 0; i < NUM_PARALLEL_LINES; i++) {
-            gLinePts[index + 0] = 150;
-            gLinePts[index + 1] = val;
-            gLinePts[index + 2] = 300;
-            gLinePts[index + 3] = val;
-            index += 4;
-            val += 8 + (2.0f/NUM_PARALLEL_LINES);
-        }
-        val = 0;
-        for (int i = 0; i < NUM_PARALLEL_LINES; i++) {
-            gLinePts[index + 0] = val;
-            gLinePts[index + 1] = 150;
-            gLinePts[index + 2] = val;
-            gLinePts[index + 3] = 300;
-            index += 4;
-            val += 8 + (2.0f/NUM_PARALLEL_LINES);
-        }
-    };
-
-    @SuppressWarnings("serial")
-    private static final Map<String, Map<String, DisplayModifier>> gMaps = Map.of(
-            "aa", Map.of(
-                    "true", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setAntiAlias(true);
-                        }
-                    },
-                    "false", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setAntiAlias(false);
-                        }
-                    }),
-            "style", Map.of(
-                    "fill", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStyle(Paint.Style.FILL);
-                        }
-                    },
-                    "stroke", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStyle(Paint.Style.STROKE);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_WIDTH_BIT; }
-                    },
-                    "fillAndStroke", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStyle(Paint.Style.FILL_AND_STROKE);
-                        }
-
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_WIDTH_BIT; }
-                    }),
-            "strokeWidth", Map.of(
-                    "hair", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeWidth(0);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_WIDTH_BIT; }
-                    },
-                    "0.3", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeWidth(0.3f);
-                        }
-                    },
-                    "1", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeWidth(1);
-                        }
-                    },
-                    "5", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeWidth(5);
-                        }
-                    },
-                    "30", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeWidth(30);
-                        }
-                    }),
-            "strokeCap", Map.of(
-                    "butt", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeCap(Paint.Cap.BUTT);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_CAP_BIT; }
-                    },
-                    "round", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeCap(Paint.Cap.ROUND);
-                        }
-                    },
-                    "square", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeCap(Paint.Cap.SQUARE);
-                        }
-                    }),
-            "strokeJoin", Map.of(
-                    "bevel", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeJoin(Paint.Join.BEVEL);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_JOIN_BIT; }
-                    },
-                    "round", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeJoin(Paint.Join.ROUND);
-                        }
-                    },
-                    "miter", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setStrokeJoin(Paint.Join.MITER);
-                        }
-                    }),
-                    // TODO: add miter0, miter1 etc to test miter distances
-            "transform", Map.of(
-                    "noTransform", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {}
-                        @Override
-                        protected int mask() { return SWEEP_TRANSFORM_BIT; };
-                    },
-                    "rotate5", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.rotate(5);
-                        }
-                    },
-                    "rotate45", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.rotate(45);
-                        }
-                    },
-                    "rotate90", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.rotate(90);
-                            canvas.translate(0, -200);
-                        }
-                    },
-                    "scale2x2", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.scale(2, 2);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_TRANSFORM_BIT; };
-                    },
-                    "rot20scl1x4", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.rotate(20);
-                            canvas.scale(1, 4);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_TRANSFORM_BIT; };
-                    }),
-            "shader", Map.ofEntries(
-                    entry("noShader", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {}
-                        @Override
-                        protected int mask() { return SWEEP_SHADER_BIT; };
-                    }),
-                    entry("repeatShader", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mRepeatShader);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_SHADER_BIT; };
-                    }),
-                    entry("translatedShader", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mTranslatedShader);
-                        }
-                    }),
-                    entry("scaledShader", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mScaledShader);
-                        }
-                    }),
-                    entry("horGradient", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mHorGradient);
-                        }
-                    }),
-                    entry("diagGradient", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mDiagGradient);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_SHADER_BIT; };
-                    }),
-                    entry("vertGradient", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mVertGradient);
-                        }
-                    }),
-                    entry("radGradient", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mRadGradient);
-                        }
-                    }),
-                    entry("sweepGradient", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mSweepGradient);
-                        }
-                    }),
-                    entry("composeShader", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mComposeShader);
-                        }
-                    }),
-                    entry("bad composeShader", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mBadComposeShader);
-                        }
-                    }),
-                    entry("bad composeShader 2", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setShader(ResourceModifiers.instance().mAnotherBadComposeShader);
-                        }
-                    })),
-            "drawing", Map.ofEntries(
-                    entry("roundRect", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawRoundRect(gRect, 20, 20, paint);
-                        }
-                    }),
-                    entry("rect", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawRect(gRect, paint);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_SHADER_BIT | SWEEP_STROKE_CAP_BIT; };
-                    }),
-                    entry("circle", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawCircle(100, 100, 75, paint);
-                        }
-                    }),
-                    entry("oval", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawOval(gRect, paint);
-                        }
-                    }),
-                    entry("lines", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawLines(gLinePts, paint);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_CAP_BIT; };
-                    }),
-                    entry("plusPoints", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawPoints(gPts, paint);
-                        }
-                    }),
-                    entry("text", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setTextSize(36);
-                            canvas.drawText("TEXTTEST", 0, 50, paint);
-                        }
-                    }),
-                    entry("shadowtext", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            paint.setTextSize(36);
-                            paint.setShadowLayer(3.0f, 0.0f, 3.0f, 0xffff00ff);
-                            canvas.drawText("TEXTTEST", 0, 50, paint);
-                        }
-                    }),
-                    entry("bitmapMesh", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawBitmapMesh(ResourceModifiers.instance().mBitmap, 3, 3,
-                                    ResourceModifiers.instance().mBitmapVertices, 0, null, 0, null);
-                        }
-                    }),
-                    entry("arc", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawArc(gRect, 260, 285, false, paint);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_CAP_BIT; };
-                    }),
-                    entry("arcFromCenter", new DisplayModifier() {
-                        @Override
-                        public void modifyDrawing(Paint paint, Canvas canvas) {
-                            canvas.drawArc(gRect, 260, 285, true, paint);
-                        }
-                        @Override
-                        protected int mask() { return SWEEP_STROKE_JOIN_BIT; };
-                    })));
-            // WARNING: DON'T PUT MORE MAPS BELOW THIS
-
-    private static Map<String, DisplayModifier> getMapAtIndex(int index) {
-        for (Map<String, DisplayModifier> map : gMaps.values()) {
-            if (index == 0) {
-                return map;
-            }
-            index--;
-        }
-        return null;
-    }
-
-    // indices instead of iterators for easier bidirectional traversal
-    private static final int mIndices[] = new int[gMaps.size()];
-    private static final String[] mLastAppliedModifications = new String[gMaps.size()];
-
-    private static boolean stepInternal(boolean forward) {
-        int modifierMapIndex = gMaps.size() - 1;
-        while (modifierMapIndex >= 0) {
-            Map<String, DisplayModifier> map = getMapAtIndex(modifierMapIndex);
-            mIndices[modifierMapIndex] += (forward ? 1 : -1);
-
-            if (mIndices[modifierMapIndex] >= 0 && mIndices[modifierMapIndex] < map.size()) {
-                break;
-            }
-
-            mIndices[modifierMapIndex] = (forward ? 0 : map.size() - 1);
-            modifierMapIndex--;
-        }
-        return modifierMapIndex < 0; // true if resetting
-    }
-
-    public static boolean step() {
-        boolean ret = false;
-        do {
-            ret |= stepInternal(true);
-        } while (!checkModificationStateMask());
-        return ret;
-    }
-
-    public static boolean stepBack() {
-        boolean ret = false;
-        do {
-            ret |= stepInternal(false);
-        } while (!checkModificationStateMask());
-        return ret;
-    }
-
-    private static boolean checkModificationStateMask() {
-        int operatorMask = 0x0;
-        int mapIndex = 0;
-        for (Map<String, DisplayModifier> map : gMaps.values()) {
-            int displayModifierIndex = mIndices[mapIndex];
-            for (Entry<String, DisplayModifier> modifierEntry : map.entrySet()) {
-                if (displayModifierIndex == 0) {
-                    mLastAppliedModifications[mapIndex] = modifierEntry.getKey();
-                    operatorMask |= modifierEntry.getValue().mask();
-                    break;
-                }
-                displayModifierIndex--;
-            }
-            mapIndex++;
-        }
-        return operatorMask == TOTAL_MASK;
-    }
-
-    public static void apply(Paint paint, Canvas canvas) {
-        int mapIndex = 0;
-        for (Map<String, DisplayModifier> map : gMaps.values()) {
-            int displayModifierIndex = mIndices[mapIndex];
-            for (Entry<String, DisplayModifier> modifierEntry : map.entrySet()) {
-                if (displayModifierIndex == 0) {
-                    mLastAppliedModifications[mapIndex] = modifierEntry.getKey();
-                    modifierEntry.getValue().modifyDrawing(paint, canvas);
-                    break;
-                }
-                displayModifierIndex--;
-            }
-            mapIndex++;
-        }
-    }
-
-    public static String[] getLastAppliedModifications() {
-        return mLastAppliedModifications.clone();
-    }
-
-    public static String[][] getStrings() {
-        String[][] keys = new String[gMaps.size()][];
-
-        int i = 0;
-        for (Map<String, DisplayModifier> map : gMaps.values()) {
-            keys[i] = new String[map.size()];
-            int j = 0;
-            for (String key : map.keySet()) {
-                keys[i][j++] = key;
-            }
-            i++;
-        }
-
-        return keys;
-    }
-
-    public static void setIndex(int mapIndex, int newIndexValue) {
-        mIndices[mapIndex] = newIndexValue;
-    }
-
-    public static int[] getIndices() {
-        return mIndices;
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java
deleted file mode 100644
index d402699b09796..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.renderscript.Allocation;
-import android.renderscript.Element;
-import android.renderscript.RenderScript;
-import android.util.Log;
-
-public class ErrorCalculator {
-    private static final String LOG_TAG = "ErrorCalculator";
-    private static final int REGION_SIZE = 8;
-
-    private static final boolean LOG_TIMING = false;
-    private static final boolean LOG_CALC = false;
-
-    private RenderScript mRS;
-    private Allocation mIdealPixelsAllocation;
-    private Allocation mGivenPixelsAllocation;
-    private Allocation mOutputPixelsAllocation;
-
-    private Allocation mInputRowsAllocation;
-    private Allocation mOutputRegionsAllocation;
-
-    private ScriptC_errorCalculator mScript;
-
-    private int[] mOutputRowRegions;
-
-    public ErrorCalculator(Context c, Resources resources) {
-        int width = resources.getDimensionPixelSize(R.dimen.layer_width);
-        int height = resources.getDimensionPixelSize(R.dimen.layer_height);
-        mOutputRowRegions = new int[height / REGION_SIZE];
-
-        mRS = RenderScript.create(c);
-        int[] rowIndices = new int[height / REGION_SIZE];
-        for (int i = 0; i < rowIndices.length; i++)
-            rowIndices[i] = i * REGION_SIZE;
-
-        mScript = new ScriptC_errorCalculator(mRS);
-        mScript.set_HEIGHT(height);
-        mScript.set_WIDTH(width);
-        mScript.set_REGION_SIZE(REGION_SIZE);
-
-        mInputRowsAllocation = Allocation.createSized(mRS, Element.I32(mRS), rowIndices.length,
-                Allocation.USAGE_SCRIPT);
-        mInputRowsAllocation.copyFrom(rowIndices);
-        mOutputRegionsAllocation = Allocation.createSized(mRS, Element.I32(mRS),
-                mOutputRowRegions.length, Allocation.USAGE_SCRIPT);
-    }
-
-
-    private static long startMillis, middleMillis;
-
-    public float calcErrorRS(Bitmap ideal, Bitmap given) {
-        if (LOG_TIMING) {
-            startMillis = System.currentTimeMillis();
-        }
-
-        mIdealPixelsAllocation = Allocation.createFromBitmap(mRS, ideal,
-                Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-        mGivenPixelsAllocation = Allocation.createFromBitmap(mRS, given,
-                Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-
-        mScript.set_ideal(mIdealPixelsAllocation);
-        mScript.set_given(mGivenPixelsAllocation);
-
-        mScript.forEach_countInterestingRegions(mInputRowsAllocation, mOutputRegionsAllocation);
-        mOutputRegionsAllocation.copyTo(mOutputRowRegions);
-
-        int regionCount = 0;
-        for (int region : mOutputRowRegions) {
-            regionCount += region;
-        }
-        int interestingPixels = Math.max(1, regionCount) * REGION_SIZE * REGION_SIZE;
-
-        if (LOG_TIMING) {
-            long startMillis2 = System.currentTimeMillis();
-        }
-
-        mScript.forEach_accumulateError(mInputRowsAllocation, mOutputRegionsAllocation);
-        mOutputRegionsAllocation.copyTo(mOutputRowRegions);
-        float totalError = 0;
-        for (int row : mOutputRowRegions) {
-            totalError += row;
-        }
-        totalError /= 1024.0f;
-
-        if (LOG_TIMING) {
-            long finalMillis = System.currentTimeMillis();
-            Log.d(LOG_TAG, "rs: first part took " + (middleMillis - startMillis) + "ms");
-            Log.d(LOG_TAG, "rs: last part took " + (finalMillis - middleMillis) + "ms");
-        }
-        if (LOG_CALC) {
-            Log.d(LOG_TAG, "rs: error " + totalError + ", pixels " + interestingPixels);
-        }
-        return totalError / interestingPixels;
-    }
-
-    public void calcErrorHeatmapRS(Bitmap ideal, Bitmap given, Bitmap output) {
-        mIdealPixelsAllocation = Allocation.createFromBitmap(mRS, ideal,
-                Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-        mGivenPixelsAllocation = Allocation.createFromBitmap(mRS, given,
-                Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-
-        mScript.set_ideal(mIdealPixelsAllocation);
-        mScript.set_given(mGivenPixelsAllocation);
-
-        mOutputPixelsAllocation = Allocation.createFromBitmap(mRS, output,
-                Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-        mScript.forEach_displayDifference(mOutputPixelsAllocation, mOutputPixelsAllocation);
-        mOutputPixelsAllocation.copyTo(output);
-    }
-
-    public static float calcError(Bitmap ideal, Bitmap given) {
-        if (LOG_TIMING) {
-            startMillis = System.currentTimeMillis();
-        }
-
-        int interestingRegions = 0;
-        for (int x = 0; x < ideal.getWidth(); x += REGION_SIZE) {
-            for (int y = 0; y < ideal.getWidth(); y += REGION_SIZE) {
-                if (inspectRegion(ideal, x, y)) {
-                    interestingRegions++;
-                }
-            }
-        }
-
-        int interestingPixels = Math.max(1, interestingRegions) * REGION_SIZE * REGION_SIZE;
-
-        if (LOG_TIMING) {
-            long startMillis2 = System.currentTimeMillis();
-        }
-
-        float totalError = 0;
-        for (int x = 0; x < ideal.getWidth(); x++) {
-            for (int y = 0; y < ideal.getHeight(); y++) {
-                int idealColor = ideal.getPixel(x, y);
-                int givenColor = given.getPixel(x, y);
-                if (idealColor == givenColor)
-                    continue;
-                totalError += Math.abs(Color.red(idealColor) - Color.red(givenColor));
-                totalError += Math.abs(Color.green(idealColor) - Color.green(givenColor));
-                totalError += Math.abs(Color.blue(idealColor) - Color.blue(givenColor));
-                totalError += Math.abs(Color.alpha(idealColor) - Color.alpha(givenColor));
-            }
-        }
-        totalError /= 1024.0f;
-        if (LOG_TIMING) {
-            long finalMillis = System.currentTimeMillis();
-            Log.d(LOG_TAG, "dvk: first part took " + (middleMillis - startMillis) + "ms");
-            Log.d(LOG_TAG, "dvk: last part took " + (finalMillis - middleMillis) + "ms");
-        }
-        if (LOG_CALC) {
-            Log.d(LOG_TAG, "dvk: error " + totalError + ", pixels " + interestingPixels);
-        }
-        return totalError / interestingPixels;
-    }
-
-    private static boolean inspectRegion(Bitmap ideal, int x, int y) {
-        int regionColor = ideal.getPixel(x, y);
-        for (int i = 0; i < REGION_SIZE; i++) {
-            for (int j = 0; j < REGION_SIZE; j++) {
-                if (ideal.getPixel(x + i, y + j) != regionColor)
-                    return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/MainView.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/MainView.java
deleted file mode 100644
index 454fe7b50ad79..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/MainView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.View;
-
-public class MainView extends View {
-    Paint mPaint = new Paint();
-
-    public MainView(Context context) {
-        super(context);
-    }
-
-    public MainView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MainView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        mPaint.reset();
-        DisplayModifier.apply(mPaint, canvas);
-
-        if (mDrawCallback != null) {
-            mDrawCallback.run();
-        }
-    }
-
-    private Runnable mDrawCallback;
-    public void addDrawCallback(Runnable drawCallback) {
-        mDrawCallback = drawCallback;
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/ManualActivity.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/ManualActivity.java
deleted file mode 100644
index 405ff65a34fdb..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/ManualActivity.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import com.android.test.hwuicompare.R;
-
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-public class ManualActivity extends CompareActivity {
-    private static final String LOG_TAG = "ManualActivity";
-    private ImageView mCompareImageView;
-    private Bitmap mCompareBitmap;
-    private TextView mErrorTextView;
-    private MainView mSoftwareView;
-
-    private static final int COMPARE_VIEW_UNINITIALIZED = -1;
-    private static final int COMPARE_VIEW_HARDWARE = 0;
-    private static final int COMPARE_VIEW_SOFTWARE = 1;
-    private static final int COMPARE_VIEW_HEATMAP = 2; // TODO: add more like this? any ideas?
-
-    private int mCompareImageViewState = COMPARE_VIEW_UNINITIALIZED;
-    private int mLastCompareImageViewState = COMPARE_VIEW_UNINITIALIZED;
-
-    Runnable mRunnable = new Runnable() {
-        @Override
-        public void run() {
-            Log.d(LOG_TAG, "mRunnable running, mRedrewFlag = " + mRedrewFlag);
-
-            if (mRedrewFlag) {
-                loadBitmaps();
-                // recalculate error
-                float error = mErrorCalculator.calcErrorRS(mSoftwareBitmap, mHardwareBitmap);
-                String modname = "";
-                for (String s : DisplayModifier.getLastAppliedModifications()) {
-                    modname = modname.concat(s + ".");
-                }
-
-                Log.d(LOG_TAG, "error for " + modname + " is " + error);
-                mErrorTextView.setText(String.format("%.4f", error));
-            }
-
-            if (mCompareImageViewState != mLastCompareImageViewState || mRedrewFlag) {
-                switch (mCompareImageViewState) {
-                    case COMPARE_VIEW_UNINITIALIZED:
-                        // set to hardware
-                    case COMPARE_VIEW_HARDWARE:
-                        mCompareImageView.setImageBitmap(mHardwareBitmap);
-                        break;
-                    case COMPARE_VIEW_SOFTWARE:
-                        mCompareImageView.setImageBitmap(mSoftwareBitmap);
-                        break;
-                    case COMPARE_VIEW_HEATMAP:
-                        mErrorCalculator.calcErrorHeatmapRS(mSoftwareBitmap, mHardwareBitmap,
-                                mCompareBitmap);
-                        mCompareImageView.setImageBitmap(mCompareBitmap);
-                        break;
-                }
-                mCompareImageView.getDrawable().setFilterBitmap(false);
-                mCompareImageView.invalidate();
-            }
-
-            mLastCompareImageViewState = mCompareImageViewState;
-            mRedrewFlag = false;
-            mHandler.removeCallbacks(mRunnable);
-        }
-    };
-
-    private void redrawViews() {
-        mHardwareView.invalidate();
-        mSoftwareView.invalidate();
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.manual_layout);
-        onCreateCommon(mRunnable);
-
-        mSoftwareView = (MainView) findViewById(R.id.software_view);
-        mSoftwareView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-        mSoftwareView.setBackgroundColor(Color.WHITE);
-        mSoftwareView.addDrawCallback(mDrawCallback);
-
-        mCompareImageView = (ImageView) findViewById(R.id.compare_image_view);
-
-        int width = getResources().getDimensionPixelSize(R.dimen.layer_width);
-        int height = getResources().getDimensionPixelSize(R.dimen.layer_height);
-        mCompareBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
-        mErrorTextView = (TextView) findViewById(R.id.current_error);
-        ((ImageButton) findViewById(R.id.next)).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                DisplayModifier.step();
-                updateSpinners();
-                redrawViews();
-            }
-        });
-        ((ImageButton) findViewById(R.id.previous)).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                DisplayModifier.stepBack();
-                updateSpinners();
-                redrawViews();
-            }
-        });
-        ((Button) findViewById(R.id.show_hardware_version))
-                .setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mCompareImageViewState = COMPARE_VIEW_HARDWARE;
-                        mHandler.post(mRunnable);
-                    }
-                });
-        ((Button) findViewById(R.id.show_software_version))
-                .setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mCompareImageViewState = COMPARE_VIEW_SOFTWARE;
-                        mHandler.post(mRunnable);
-                    }
-                });
-        ((Button) findViewById(R.id.show_error_heatmap)).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mCompareImageViewState = COMPARE_VIEW_HEATMAP;
-                mHandler.post(mRunnable);
-            }
-        });
-
-        buildSpinnerLayout();
-    }
-
-    private class DisplayModifierSpinner extends Spinner {
-        private final int mIndex;
-
-        public DisplayModifierSpinner(int index) {
-            super(ManualActivity.this);
-            mIndex = index;
-            setOnItemSelectedListener(new OnItemSelectedListener() {
-
-                @Override
-                public void onItemSelected(AdapterView<?> parentView, View selectedItem,
-                        int position, long id) {
-                    DisplayModifier.setIndex(mIndex, position);
-                    redrawViews();
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> parentView) {
-                }
-            });
-        }
-    }
-
-    private Spinner[] mSpinners;
-
-    private void buildSpinnerLayout() {
-        LinearLayout layout = (LinearLayout) findViewById(R.id.spinner_layout);
-        String[][] mapsStrings = DisplayModifier.getStrings();
-        mSpinners = new Spinner[mapsStrings.length];
-        int index = 0;
-        for (String[] spinnerValues : mapsStrings) {
-            mSpinners[index] = new DisplayModifierSpinner(index);
-            mSpinners[index].setAdapter(new ArrayAdapter<String>(this,
-                    android.R.layout.simple_spinner_dropdown_item, spinnerValues));
-            layout.addView(mSpinners[index]);
-            index++;
-        }
-        Log.d(LOG_TAG, "created " + index + " spinners");
-    }
-
-    private void updateSpinners() {
-        int[] indices = DisplayModifier.getIndices();
-        for (int i = 0; i < mSpinners.length; i++) {
-            mSpinners[i].setSelection(indices[i]);
-        }
-    }
-
-    @Override
-    protected boolean forceRecreateBitmaps() {
-        // continually recreate bitmaps to avoid modifying bitmaps currently being drawn
-        return true;
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java
deleted file mode 100644
index d5224813c0bc2..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test.hwuicompare;
-
-import com.android.test.hwuicompare.R;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.BitmapShader;
-import android.graphics.Color;
-import android.graphics.ComposeShader;
-import android.graphics.LinearGradient;
-import android.graphics.PorterDuff;
-import android.graphics.RadialGradient;
-import android.graphics.SweepGradient;
-import android.graphics.Matrix;
-import android.graphics.Shader;
-
-public class ResourceModifiers {
-        public final BitmapShader mRepeatShader;
-        public final BitmapShader mTranslatedShader;
-        public final BitmapShader mScaledShader;
-        private final int mTexWidth;
-        private final int mTexHeight;
-        private final float mDrawWidth;
-        private final float mDrawHeight;
-        public final LinearGradient mHorGradient;
-        public final LinearGradient mDiagGradient;
-        public final LinearGradient mVertGradient;
-        public final RadialGradient mRadGradient;
-        public final SweepGradient mSweepGradient;
-        public final ComposeShader mComposeShader;
-        public final ComposeShader mBadComposeShader;
-        public final ComposeShader mAnotherBadComposeShader;
-        public final Bitmap mBitmap;
-        private final Matrix mMtx1;
-        private final Matrix mMtx2;
-        private final Matrix mMtx3;
-
-        public final float[] mBitmapVertices;
-        public final int[] mBitmapColors;
-
-        private static ResourceModifiers sInstance = null;
-        public static ResourceModifiers instance() { return sInstance; }
-        public static void init(Resources resources) {
-            sInstance = new ResourceModifiers(resources);
-        }
-
-        public ResourceModifiers(Resources resources) {
-            mBitmap = BitmapFactory.decodeResource(resources, R.drawable.sunset1);
-            mTexWidth = mBitmap.getWidth();
-            mTexHeight = mBitmap.getHeight();
-
-            mDrawWidth = resources.getDimensionPixelSize(R.dimen.layer_width);
-            mDrawHeight = resources.getDimensionPixelSize(R.dimen.layer_height);
-
-            mRepeatShader = new BitmapShader(mBitmap, Shader.TileMode.REPEAT,
-                    Shader.TileMode.REPEAT);
-
-            mTranslatedShader = new BitmapShader(mBitmap, Shader.TileMode.REPEAT,
-                    Shader.TileMode.REPEAT);
-            mMtx1 = new Matrix();
-            mMtx1.setTranslate(mTexWidth / 2.0f, mTexHeight / 2.0f);
-            mMtx1.postRotate(45, 0, 0);
-            mTranslatedShader.setLocalMatrix(mMtx1);
-
-            mScaledShader = new BitmapShader(mBitmap, Shader.TileMode.MIRROR,
-                    Shader.TileMode.MIRROR);
-            mMtx2 = new Matrix();
-            mMtx2.setScale(0.5f, 0.5f);
-            mScaledShader.setLocalMatrix(mMtx2);
-
-            mHorGradient = new LinearGradient(0.0f, 0.0f, 1.0f, 0.0f,
-                    Color.RED, Color.GREEN, Shader.TileMode.CLAMP);
-            mMtx3 = new Matrix();
-            mMtx3.setScale(mDrawHeight, 1.0f);
-            mMtx3.postRotate(-90.0f);
-            mMtx3.postTranslate(0.0f, mDrawHeight);
-            mHorGradient.setLocalMatrix(mMtx3);
-
-            mDiagGradient = new LinearGradient(0.0f, 0.0f, mDrawWidth / 2.0f, mDrawHeight / 2.0f,
-                    Color.BLUE, Color.RED, Shader.TileMode.CLAMP);
-
-            mVertGradient = new LinearGradient(0.0f, 0.0f, 0.0f, mDrawHeight / 2.0f,
-                    Color.YELLOW, Color.MAGENTA, Shader.TileMode.MIRROR);
-
-            mSweepGradient = new SweepGradient(mDrawWidth / 2.0f, mDrawHeight / 2.0f,
-                    Color.YELLOW, Color.MAGENTA);
-
-            mComposeShader = new ComposeShader(mRepeatShader, mHorGradient,
-                    PorterDuff.Mode.MULTIPLY);
-
-            final float width = mBitmap.getWidth() / 8.0f;
-            final float height = mBitmap.getHeight() / 8.0f;
-
-            mBitmapVertices = new float[] {
-                0.0f, 0.0f, width, 0.0f, width * 2, 0.0f, width * 3, 0.0f,
-                0.0f, height, width, height, width * 2, height, width * 4, height,
-                0.0f, height * 2, width, height * 2, width * 2, height * 2, width * 3, height * 2,
-                0.0f, height * 4, width, height * 4, width * 2, height * 4, width * 4, height * 4,
-            };
-
-            mBitmapColors = new int[] {
-                0xffff0000, 0xff00ff00, 0xff0000ff, 0xffff0000,
-                0xff0000ff, 0xffff0000, 0xff00ff00, 0xff00ff00,
-                0xff00ff00, 0xff0000ff, 0xffff0000, 0xff00ff00,
-                0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ff0000,
-            };
-
-            // Use a repeating gradient with many colors to test the non simple case.
-            mRadGradient = new RadialGradient(mDrawWidth / 4.0f, mDrawHeight / 4.0f, 4.0f,
-                    mBitmapColors, null, Shader.TileMode.REPEAT);
-
-            mBadComposeShader = new ComposeShader(mRadGradient, mComposeShader,
-                    PorterDuff.Mode.MULTIPLY);
-
-            mAnotherBadComposeShader = new ComposeShader(mRadGradient, mVertGradient,
-                    PorterDuff.Mode.MULTIPLY);
-        }
-
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/Test.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/Test.java
deleted file mode 100644
index 1ff153c003c14..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/Test.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.android.test.hwuicompare;
-
-import com.android.test.hwuicompare.AutomaticActivity.FinalCallback;
-
-import android.os.Bundle;
-import android.test.ActivityInstrumentationTestCase2;
-
-public class Test extends ActivityInstrumentationTestCase2<AutomaticActivity> {
-    AutomaticActivity mActivity;
-    private Bundle mBundle;
-
-    public Test() {
-        super(AutomaticActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mBundle = new Bundle();
-        mActivity = getActivity();
-        mActivity.setFinalCallback(new FinalCallback() {
-
-            @Override
-            void report(String key, float value) {
-                mBundle.putFloat(key, value);
-            }
-            @Override
-            void complete() {
-                synchronized(mBundle) {
-                    mBundle.notify();
-                }
-            }
-        });
-    }
-
-    public void testCanvas() {
-        synchronized(mBundle) {
-            try {
-                mBundle.wait();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        getInstrumentation().sendStatus(0, mBundle);
-    }
-}
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rscript b/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rscript
deleted file mode 100644
index 0a1742ef38670..0000000000000
--- a/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rscript
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(com.android.test.hwuicompare)
-
-int REGION_SIZE;
-int WIDTH;
-int HEIGHT;
-
-rs_allocation ideal;
-rs_allocation given;
-
-void countInterestingRegions(const int32_t *v_in, int32_t *v_out) {
-    int y = v_in[0];
-    v_out[0] = 0;
-
-    for (int x = 0; x < HEIGHT; x += REGION_SIZE) {
-        bool interestingRegion = false;
-        uchar4 regionColor = rsGetElementAt_uchar4(ideal, x, y);
-        for (int i = 0; i < REGION_SIZE && !interestingRegion; i++) {
-            for (int j = 0; j < REGION_SIZE && !interestingRegion; j++) {
-                uchar4 testVal = rsGetElementAt_uchar4(ideal, x + j, y + i);
-                interestingRegion |= (testVal.r != regionColor.r);
-                interestingRegion |= (testVal.g != regionColor.g);
-                interestingRegion |= (testVal.b != regionColor.b);
-                interestingRegion |= (testVal.a != regionColor.a);
-            }
-        }
-        if (interestingRegion) {
-            v_out[0]++;
-        }
-    }
-}
-
-void accumulateError(const int32_t *v_in, int32_t *v_out) {
-    int startY = v_in[0];
-    int error = 0;
-    for (int y = startY; y < startY + REGION_SIZE; y++) {
-        for (int x = 0; x < HEIGHT; x++) {
-            uchar4 idealPixel = rsGetElementAt_uchar4(ideal, x, y);
-            uchar4 givenPixel = rsGetElementAt_uchar4(given, x, y);
-
-            error += abs(idealPixel.x - givenPixel.x);
-            error += abs(idealPixel.y - givenPixel.y);
-            error += abs(idealPixel.z - givenPixel.z);
-            error += abs(idealPixel.w - givenPixel.w);
-        }
-    }
-    v_out[0] = error;
-}
-
-void displayDifference(const uchar4 *v_in, uchar4 *v_out, uint32_t x, uint32_t y) {
-    float4 idealPixel = rsGetElementAt_float4(ideal, x, y);
-    float4 givenPixel = rsGetElementAt_float4(given, x, y);
-
-    float4 diff = idealPixel - givenPixel;
-    float totalDiff = diff.x + diff.y + diff.z + diff.w;
-    if (totalDiff < 0) {
-        v_out[0] = rsPackColorTo8888(0, 0, clamp(-totalDiff/2.f, 0.f, 1.f));
-    } else {
-        v_out[0] = rsPackColorTo8888(clamp(totalDiff/2.f, 0.f, 1.f), 0, 0);
-    }
-}