From 25daf555d20557ee75f12eae59cc699120e9a831 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Mon, 27 Jul 2015 16:27:12 -0700 Subject: [PATCH] cmsdk: Add functional manual and unit tests for new setIcon Change-Id: Ia0f83c76429f80a7b7a4216e0cdf7d71844b9b64 --- .../drawable-hdpi/ic_whatshot_white_24dp.png | Bin 0 -> 468 bytes .../drawable-mdpi/ic_whatshot_white_24dp.png | Bin 0 -> 334 bytes .../drawable-xhdpi/ic_whatshot_white_24dp.png | Bin 0 -> 595 bytes .../ic_whatshot_white_24dp.png | Bin 0 -> 866 bytes .../ic_whatshot_white_24dp.png | Bin 0 -> 1129 bytes .../tests/customtiles/CMStatusBarTest.java | 94 ++++++++++++++++++ .../unit/CustomTileBuilderTest.java | 14 +++ 7 files changed, 108 insertions(+) create mode 100644 tests/res/drawable-hdpi/ic_whatshot_white_24dp.png create mode 100644 tests/res/drawable-mdpi/ic_whatshot_white_24dp.png create mode 100644 tests/res/drawable-xhdpi/ic_whatshot_white_24dp.png create mode 100644 tests/res/drawable-xxhdpi/ic_whatshot_white_24dp.png create mode 100644 tests/res/drawable-xxxhdpi/ic_whatshot_white_24dp.png diff --git a/tests/res/drawable-hdpi/ic_whatshot_white_24dp.png b/tests/res/drawable-hdpi/ic_whatshot_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..46ed1f8b67db8c34ee5ec652fab79b36ef42a684 GIT binary patch literal 468 zcmV;_0W1EAP)5Q+*74bf0x&=Nt=AV`E`P;rr% zjXDH^f>SO>Q6R;g4&L4KeM_!?|GRhZ|K5wMtQ@v7FkaE7-?&cDjH2)q>kD@n<{Vd9q~507XyO~ue0DK<<-#Cw zCU}8yO)lIf$`%=kNsK3Q;Uz9x+@)PVaRFmVE^JV5g&8i=q+d9W@lh^(r`87s6hI22 zAQwthTc=ea@Tu_RLWyc)3PB2^C>K6q`LrkmXEAbe;Vo8Kp}2>Ul?ykic2adXN*-fM zF7&X6^*{kMvxMQ1mK)EpJjPUoW4yzlnj?B;F2e!PLcWj2anrF;5%c2NSX}hp$76Tfz#mu|gK@oGFANh9etScs3QnAx2X+cJOQ~ zfN9<_O0tp1#kgl&J&bXV;gVB7s(2dAGQuPUZt#>9g%rm`IU=cOq^RN&)VR$jkiw|991>Z51df-u$x84 zRV}Qg=!mL?ITq#UQgx7_XqI)V25#}o1T|WIT&CohmV$aVD-uJLd}h7kW0*cg;u5B- zii{AFj`GhG)tK2YzpT`0D(7-A3_zlPvjXWplF8f(cEzRs;koN>lk&rvu z$P&jaEsBQ@vbdUMlj5U|XSkT6MN2~i=gCt^jsX(-6SR@WBaFugty&JO7r0tpIELMaN&@wqXVwGqKn-Kqw3Fc(-sVUA4Js=7Sr{7>1#2m?Fj^D^ zEyVXdHt#D6J|?bjNi&Wqt0)*Io-@=*oWQ15p}2u~j&ZI2K|40v6pGzMH_9IUhwa!r zrcgXjG*fhNz5YiUn@)w|J;MFMbEI_zMltm$6kiZxkWTJknJoAk(^m?`5BT_Qg9Q$K_=O;5zb{x)h3LT%J_` z_F&VbP&DB3k^=B0rXqC;$0_W3d=hUbu=uY%+?1HB4gHEH89plcQGA z@EUemR;nzX!mdM6v5p*eM^zHbIEdW@4T_F-Tn@8b4y>mSmo~*ginF-%vqc8dyvPJD zr>RjqY+?eJ0w;KgO{^qEn%l^5oQt@P)2R5^MS&#b*`Z|6N)lR>99k(5N1hfXi=F&M zRO9SW^4Q2XL~)u%Eeui|AV-J^+NjY&VlACa;v+`~4O$GW;c-q<#HGjp8EUn-sOLet s=wpZxrkQ4hA^PZ|i8?J=vZQML4Wq^#!k7$FxBvhE07*qoM6N<$f@DjJI{*Lx literal 0 HcmV?d00001 diff --git a/tests/res/drawable-xxxhdpi/ic_whatshot_white_24dp.png b/tests/res/drawable-xxxhdpi/ic_whatshot_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5c5d86873cce687891517d459d778b4b840d38c4 GIT binary patch literal 1129 zcmV-v1eW`WP)Z*MU8R+!PP3YYb2E=S+pnxf>h`>!&wJ)e=ene<{}H+?-gt{5#Tl!Q-KusDXz%pqBQdqR~+J^79LeRv5{5_6h|zgRWq{{KitlLnwYA%p%<5G;AX`Q zr?}J!1}I+mgv;%ttKx)pTxp%+gy(2$zT$(qwDkug6&FmQJyql=9vDUYmMR_?O#7M` zqfBC;0-+Zsdr2r$=)(>LLJ!PJl^G=2&3*+!FU(GpuT0y7{e{;stCkH^W8bIr)8CkZS&B{yi!P+F zE6p-;^e+bCq)1^g3cD&9qsvf-+1(0@nb=dq47I_>m@QIREWw5rKI9$}Y6ojDTdA;E zPgn3qU=?l#DIofj!mM02a2sx> zD@s6eJUPvNYQ-tvtCPU2*-Y~fnY;%tR{q8pVsIYSTG!^=2p z;uiTpH+JEyOg7Pz(>VKqzVe7dDslD;d9sT~aC3m`%riBd*Q@fbJdM@Cuo+3qqxp>jcZXRbmy~*Jk`clkX)^Y@|W+^(XCTiu1 z5=pibr7a{BEppjORNkYDqDL; expandedListItems = + new ArrayList(); + int resourceInt = R.drawable.ic_whatshot_white_24dp; + Bitmap bitmap = BitmapFactory.decodeResource(getResources(), + resourceInt); + for (int i = 0; i < 20; i++) { + CustomTile.ExpandedListItem expandedListItem = + new CustomTile.ExpandedListItem(); + expandedListItem.setExpandedListItemBitmap(bitmap); + expandedListItem.setExpandedListItemTitle("Test: " + i); + expandedListItem.setExpandedListItemSummary("Test item summary " + i); + expandedListItem.setExpandedListItemOnClickIntent(intent); + expandedListItems.add(expandedListItem); + } + + CustomTile.ListExpandedStyle listExpandedStyle = + new CustomTile.ListExpandedStyle(); + listExpandedStyle.setListItems(expandedListItems); + CustomTile customTile = new CustomTile.Builder(CMStatusBarTest.this) + .setLabel("Test Expanded List Style From SDK") + .setIcon(R.drawable.ic_launcher) + .setExpandedStyle(listExpandedStyle) + .setOnSettingsClickIntent(new Intent(CMStatusBarTest.this, + DummySettings.class) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + .setContentDescription("Content description") + .build(); + CMStatusBarManager.getInstance(CMStatusBarTest.this) + .publishTile(CUSTOM_TILE_SETTINGS_ID, customTile); + } + }, + new Test("test publish tile with expanded grid") { public void run() { PendingIntent intent = PendingIntent.getActivity(CMStatusBarTest.this, 0, @@ -187,6 +245,42 @@ public class CMStatusBarTest extends TestActivity { expandedGridItems.add(expandedGridItem); } + CustomTile.GridExpandedStyle gridExpandedStyle = + new CustomTile.GridExpandedStyle(); + gridExpandedStyle.setGridItems(expandedGridItems); + CustomTile customTile = new CustomTile.Builder(CMStatusBarTest.this) + .setLabel("Test Expanded Grid Style From SDK") + .setIcon(R.drawable.ic_launcher) + .setExpandedStyle(gridExpandedStyle) + .setOnSettingsClickIntent(new Intent(CMStatusBarTest.this, + DummySettings.class) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + .setContentDescription("Content description") + .build(); + CMStatusBarManager.getInstance(CMStatusBarTest.this) + .publishTile(CUSTOM_TILE_SETTINGS_ID, customTile); + } + }, + + new Test("test publish tile with expanded grid with bitmaps") { + public void run() { + PendingIntent intent = PendingIntent.getActivity(CMStatusBarTest.this, 0, + new Intent(CMStatusBarTest.this, CMStatusBarTest.class) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), 0); + ArrayList expandedGridItems = + new ArrayList(); + int resourceInt = R.drawable.ic_whatshot_white_24dp; + Bitmap bitmap = BitmapFactory.decodeResource(getResources(), + resourceInt); + for (int i = 0; i < 8; i++) { + CustomTile.ExpandedGridItem expandedGridItem = + new CustomTile.ExpandedGridItem(); + expandedGridItem.setExpandedGridItemBitmap(bitmap); + expandedGridItem.setExpandedGridItemTitle("Test: " + i); + expandedGridItem.setExpandedGridItemOnClickIntent(intent); + expandedGridItems.add(expandedGridItem); + } + CustomTile.GridExpandedStyle gridExpandedStyle = new CustomTile.GridExpandedStyle(); gridExpandedStyle.setGridItems(expandedGridItems); diff --git a/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java b/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java index f2a5e31..93bd132 100644 --- a/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java +++ b/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java @@ -18,6 +18,8 @@ package org.cyanogenmod.tests.customtiles.unit; import android.app.PendingIntent; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.net.Uri; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.MediumTest; @@ -106,6 +108,18 @@ public class CustomTileBuilderTest extends AndroidTestCase { assertEquals(resourceInt, customTile.icon); } + @SmallTest + public void testCustomTileBuilderRemoteIconSet() { + int resourceInt = R.drawable.ic_whatshot_white_24dp; + Bitmap bitmap = BitmapFactory.decodeResource(getContext().getResources(), + resourceInt); + CustomTile customTile = new CustomTile.Builder(mContext) + .setIcon(bitmap) + .build(); + assertNotNull(customTile.remoteIcon); + assertEquals(bitmap, customTile.remoteIcon); + } + @SmallTest public void testCustomTileBuilderCollapsePanelSet() { boolean collapsePanel = true;