summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-06-16 18:46:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-16 18:46:37 -0700
commitb6c2a87511aeb5b7cc2c20417503dc52a283067c (patch)
tree3caa9c3bdce9d1d9d70e29242f92833f8e7e95b6 /src
parentd8f7de94f9f4f2d868a49451dcf97ade9c1f5a77 (diff)
parenteb66b14000712b92fa6a5ba28f5bc47ce8fab6bd (diff)
downloadandroid_packages_apps_Trebuchet-b6c2a87511aeb5b7cc2c20417503dc52a283067c.tar.gz
android_packages_apps_Trebuchet-b6c2a87511aeb5b7cc2c20417503dc52a283067c.tar.bz2
android_packages_apps_Trebuchet-b6c2a87511aeb5b7cc2c20417503dc52a283067c.zip
Merge "Fixing small issue with widget divider showing in Phone UI and Shop text showing in other languages."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java7
-rw-r--r--src/com/android/launcher2/PagedViewWidget.java15
2 files changed, 21 insertions, 1 deletions
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;