[Replicant] [PATCH 3/4] Revert "Trebuchet: STK app rename customization for latam region."

[belgin]

This reverts commit 6fa6ff6929948a1b522f93aac2af226555a98e3e.
---
 res/values/config.xml                              |  1 -
 src/com/android/launcher3/IconCache.java           | 25 ++---------------
 src/com/android/launcher3/LauncherApplication.java | 31 ----------------------
 3 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 8fdd38283..4d3f01111 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -7,7 +7,6 @@
     <bool name="config_largeHeap">false</bool>
     <bool name="is_tablet">false</bool>
     <bool name="is_large_tablet">false</bool>
-    <bool name="config_launcher_stkAppRename">false</bool>
 
     <!-- Max number of page indicators to show -->
     <integer name="config_maxNumberOfPageIndicatorsToShow">21</integer>
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index cecfb6dd3..ca5545df0 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -66,7 +66,6 @@ import java.util.Stack;
 public class IconCache {
 
     private static final String TAG = "Launcher.IconCache";
-    private final String STK_PACKAGE_NAME = "com.android.stk";
 
     private static final int INITIAL_ICON_CACHE_CAPACITY = 50;
 
@@ -568,16 +567,6 @@ public class IconCache {
             UserHandleCompat user, boolean usePackageIcon, boolean useLowResIcon) {
         ComponentKey cacheKey = new ComponentKey(componentName, user);
         CacheEntry entry = mCache.get(cacheKey);
-        boolean condition = (mContext.getResources().
-                getBoolean(R.bool.config_launcher_stkAppRename))
-                && info.getComponentName().getPackageName().toString()
-                        .equalsIgnoreCase(STK_PACKAGE_NAME);
-        boolean isCustomTitle = false;
-        if (condition
-                && !TextUtils.isEmpty(((LauncherApplication) mContext)
-                        .getStkAppName())) {
-            isCustomTitle = true;
-        }
         if (entry == null || (entry.isLowResIcon && !useLowResIcon)) {
             entry = new CacheEntry();
             mCache.put(cacheKey, entry);
@@ -594,12 +583,7 @@ public class IconCache {
                             if (DEBUG) Log.d(TAG, "using package default icon for " +
                                     componentName.toShortString());
                             entry.icon = packageEntry.icon;
-                            if (isCustomTitle) {
-                                entry.title = ((LauncherApplication) mContext)
-                                    .getStkAppName();
-                            } else {
-                                entry.title = packageEntry.title;
-                            }
+                            entry.title = packageEntry.title;
                             entry.contentDescription = packageEntry.contentDescription;
                         }
                     }
@@ -612,12 +596,7 @@ public class IconCache {
             }
 
             if (TextUtils.isEmpty(entry.title) && info != null) {
-                if (isCustomTitle) {
-                    entry.title = ((LauncherApplication) mContext)
-                        .getStkAppName();
-                } else {
-                    entry.title = info.getLabel();
-                }
+                entry.title = info.getLabel();
                 entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, user);
             }
         }
diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java
index a750fc270..896963e6d 100644
--- a/src/com/android/launcher3/LauncherApplication.java
+++ b/src/com/android/launcher3/LauncherApplication.java
@@ -17,10 +17,6 @@
 package com.android.launcher3;
 
 import android.app.Application;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 
 import com.android.launcher3.stats.LauncherStats;
 import com.android.launcher3.stats.internal.service.AggregationIntentService;
@@ -30,11 +26,6 @@ import com.cyanogen.ambient.common.api.AmbientApiClient;
 
 public class LauncherApplication extends Application {
 
-    private String mStkAppName = new String();
-    private final String STK_PACKAGE_INTENT_ACTION_NAME =
-            "org.codeaurora.carrier.ACTION_TELEPHONY_SEND_STK_TITLE";
-    private final String STK_APP_NAME = "StkTitle";
-
     private static LauncherStats sLauncherStats = null;
     private AmbientApiClient mClient;
 
@@ -54,32 +45,10 @@ public class LauncherApplication extends Application {
                 .addApi(AnalyticsServices.API)
                 .build();
         mClient.connect();
-        if (getResources().getBoolean(R.bool.config_launcher_stkAppRename)) {
-            registerAppNameChangeReceiver();
-        }
         sLauncherStats = LauncherStats.getInstance(this);
         AggregationIntentService.scheduleService(this);
     }
 
-    private void registerAppNameChangeReceiver() {
-        IntentFilter intentFilter = new IntentFilter(STK_PACKAGE_INTENT_ACTION_NAME);
-        registerReceiver(appNameChangeReceiver, intentFilter);
-    }
-
-    /**
-     * Receiver for STK Name change broadcast
-     */
-    private BroadcastReceiver appNameChangeReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            mStkAppName = intent.getStringExtra(STK_APP_NAME);
-        }
-    };
-
-    public String getStkAppName(){
-        return mStkAppName;
-    }
-
     public void sendEvent(Event event) {
         if (mClient.isConnected()) {
             AnalyticsServices.AnalyticsApi.sendEvent(mClient, event);
-- 
2.11.0