commit 2b44d5bf029ccc4023fe4e1fefd099ff772f9c8f
author Sooraj Sasindran <sasindran@google.com> Wed Jan 29 15:17:48 2020 -0800
committer Sooraj Sasindran <sasindran@google.com> Wed Jan 29 17:00:35 2020 -0800
tree 3c0015df5b9deadacb4db06ac199c22ec8488f10
parent 10da9292de39b7770793536bd123feb95d092248

Move resources to Stk App resources

Move resources to Stk App resources

Bug: 143289541
Test: make
Change-Id: Ie7ff1eb29b9c8d3c4db51e1eae7630669fa4a343

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 30e29fc..5ed7007 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -1680,7 +1680,7 @@
             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(
@@ -2147,7 +2147,7 @@
                 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);
@@ -2164,7 +2164,7 @@
             } 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(
@@ -2215,7 +2215,7 @@
         Resources resource = Resources.getSystem();
         try {
             displayDialog = !resource.getBoolean(
-                    com.android.internal.R.bool.config_stkNoAlphaUsrCnf);
+                    R.bool.config_stkNoAlphaUsrCnf);
         } catch (NotFoundException e) {
             displayDialog = true;
         }
@@ -2361,7 +2361,7 @@
 
         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);
         }
 
@@ -2390,8 +2390,7 @@
                     .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);
         }