From eb66b14000712b92fa6a5ba28f5bc47ce8fab6bd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 16 Jun 2011 13:14:22 -0700
Subject: Fixing small issue with widget divider showing in Phone UI and Shop
 text showing in other languages.

- Removing some unused assets

Change-Id: I40dec108b35ed4fcc769405446664e8180cb6d41
---
 src/com/android/launcher2/Launcher.java        |  7 ++++++-
 src/com/android/launcher2/PagedViewWidget.java | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7d2c74184..bda55919d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2846,7 +2846,7 @@ public final class Launcher extends Activity
     }
 
     /**
-     * Sets the app market icon (shown when all apps is visible on x-large screens)
+     * Sets the app market icon
      */
     private void updateAppMarketIcon() {
         final View marketButton = findViewById(R.id.market_button);
@@ -2859,6 +2859,11 @@ public final class Launcher extends Activity
             sAppMarketIcon = updateTextButtonWithIconFromExternalActivity(
                     R.id.market_button, activityName, R.drawable.app_market_generic);
             marketButton.setVisibility(View.VISIBLE);
+            
+            // Remove the shop icon text in the Phone UI
+            if (!LauncherApplication.isScreenLarge()) {
+                ((TextView) marketButton).setText("");
+            }
         } else {
             // We should hide and disable the view so that we don't try and restore the visibility
             // of it when we swap between drag & normal states from IconDropTarget subclasses.
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java
index 6ddecf1ec..4061f1995 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher2/PagedViewWidget.java
@@ -193,6 +193,11 @@ public class PagedViewWidget extends LinearLayout implements Checkable {
         final TextView dims = (TextView) findViewById(R.id.widget_dims);
         dims.setText(String.format(mDimensionsFormatString, cellSpan[0], cellSpan[1]));
         dims.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        
+        // Hide the divider in the Phone UI.
+        if (!LauncherApplication.isScreenLarge()) {
+            findViewById(R.id.divider).setVisibility(View.GONE);
+        }
 
         if (createHolographicOutline) {
             mIconCache = cache;
@@ -215,6 +220,11 @@ public class PagedViewWidget extends LinearLayout implements Checkable {
             dims.setText(String.format(mDimensionsFormatString, 1, 1));
             dims.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
+        
+        // Hide the divider in the Phone UI.
+        if (!LauncherApplication.isScreenLarge()) {
+            findViewById(R.id.divider).setVisibility(View.GONE);
+        }
 
         if (createHolographicOutline) {
             mIconCache = cache;
@@ -234,6 +244,11 @@ public class PagedViewWidget extends LinearLayout implements Checkable {
         TextView name = (TextView) findViewById(R.id.wallpaper_name);
         name.setText(info.loadLabel(packageManager));
         name.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        
+        // Hide the divider in the Phone UI.
+        if (!LauncherApplication.isScreenLarge()) {
+            findViewById(R.id.divider).setVisibility(View.GONE);
+        }
 
         if (createHolographicOutline) {
             mIconCache = cache;
-- 
cgit v1.2.3