Merge "Move resources to Stk App resources"

7 files changed, 16 insertions, 7 deletions

diff --git a/res/drawable-hdpi/stat_notify_sim_toolkit.png b/res/drawable-hdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..a357251
--- /dev/null
+++ b/res/drawable-hdpi/stat_notify_sim_toolkit.png
diff --git a/res/drawable-ldpi/stat_notify_sim_toolkit.png b/res/drawable-ldpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..d9a62a9
--- /dev/null
+++ b/res/drawable-ldpi/stat_notify_sim_toolkit.png
diff --git a/res/drawable-mdpi/stat_notify_sim_toolkit.png b/res/drawable-mdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..6a774cf
--- /dev/null
+++ b/res/drawable-mdpi/stat_notify_sim_toolkit.png
diff --git a/res/drawable-xhdpi/stat_notify_sim_toolkit.png b/res/drawable-xhdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..9e1df72
--- /dev/null
+++ b/res/drawable-xhdpi/stat_notify_sim_toolkit.png
diff --git a/res/drawable-xxhdpi/stat_notify_sim_toolkit.png b/res/drawable-xxhdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..d1cf3d7
--- /dev/null
+++ b/res/drawable-xxhdpi/stat_notify_sim_toolkit.png
diff --git a/res/values/config.xml b/res/values/config.xml
index d5f912e..2636db6 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,4 +17,14 @@
 <resources>
     <!-- Determines if alpha identifier of SET-UP MENU command is used for the menu title only -->
     <bool name="show_menu_title_only_on_menu">true</bool>
+
+    <!-- set to false if we need to show user confirmation
+     when alpha identifier is not provided by the UICC -->
+    <bool name="config_stkNoAlphaUsrCnf">true</bool>
+
+    <!-- Flag indicating whether the surface flinger is inefficient
+     at performing a blur.  Used by parts of the UI to turn off
+     the blur effect where it isn't worth the performance hit.
+     As of Honeycomb, blurring is not supported anymore. -->
+    <bool name="config_sf_slowBlur">true</bool>
 </resources>
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 87e4607..9f86610 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -1682,7 +1682,7 @@ public class StkAppService extends Service implements Runnable {
             builder.setContentTitle(menu.title);
         }
 
-        builder.setSmallIcon(com.android.internal.R.drawable.stat_notify_sim_toolkit);
+        builder.setSmallIcon(R.drawable.stat_notify_sim_toolkit);
         builder.setOngoing(true);
         builder.setOnlyAlertOnce(true);
         builder.setColor(getResources().getColor(
@@ -2149,7 +2149,7 @@ public class StkAppService extends Service implements Runnable {
                 notificationBuilder.setContentTitle("");
             }
             notificationBuilder
-                    .setSmallIcon(com.android.internal.R.drawable.stat_notify_sim_toolkit);
+                    .setSmallIcon(R.drawable.stat_notify_sim_toolkit);
             notificationBuilder.setContentIntent(pendingIntent);
             notificationBuilder.setOngoing(true);
             notificationBuilder.setOnlyAlertOnce(true);
@@ -2166,7 +2166,7 @@ public class StkAppService extends Service implements Runnable {
             } else {
                 Bitmap bitmapIcon = BitmapFactory.decodeResource(StkAppService.this
                     .getResources().getSystem(),
-                    com.android.internal.R.drawable.stat_notify_sim_toolkit);
+                    R.drawable.stat_notify_sim_toolkit);
                 notificationBuilder.setLargeIcon(bitmapIcon);
             }
             notificationBuilder.setColor(mContext.getResources().getColor(
@@ -2217,7 +2217,7 @@ public class StkAppService extends Service implements Runnable {
         Resources resource = Resources.getSystem();
         try {
             displayDialog = !resource.getBoolean(
-                    com.android.internal.R.bool.config_stkNoAlphaUsrCnf);
+                    R.bool.config_stkNoAlphaUsrCnf);
         } catch (NotFoundException e) {
             displayDialog = true;
         }
@@ -2363,7 +2363,7 @@ public class StkAppService extends Service implements Runnable {
 
         dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
         if (!mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_sf_slowBlur)) {
+                R.bool.config_sf_slowBlur)) {
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
         }
 
@@ -2392,8 +2392,7 @@ public class StkAppService extends Service implements Runnable {
                     .create();
 
         dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
-        if (!mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_sf_slowBlur)) {
+        if (!mContext.getResources().getBoolean(R.bool.config_sf_slowBlur)) {
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
         }