diff --git a/res/drawable-hdpi/ic_launcher_folder.png b/res/drawable-hdpi/ic_launcher_folder.png deleted file mode 100644 index dd7132716c..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_folder.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_folder_open.png b/res/drawable-hdpi/ic_launcher_folder_open.png deleted file mode 100644 index 5b3fcecb3e..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_folder_open.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_shortcut.png b/res/drawable-hdpi/ic_launcher_shortcut.png deleted file mode 100644 index 93ab2df73a..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_shortcut.png and /dev/null differ diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png deleted file mode 100644 index 89b23eeb95..0000000000 Binary files a/res/drawable-hdpi/trashcan.png and /dev/null differ diff --git a/res/drawable-hdpi/trashcan_hover.png b/res/drawable-hdpi/trashcan_hover.png deleted file mode 100644 index d156d46583..0000000000 Binary files a/res/drawable-hdpi/trashcan_hover.png and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_divider.png b/res/drawable-hdpi/wallpaper_divider.png deleted file mode 100644 index 2f92d60049..0000000000 Binary files a/res/drawable-hdpi/wallpaper_divider.png and /dev/null differ diff --git a/res/drawable-large-nodpi/customize_bg_gradient.png b/res/drawable-large-nodpi/customize_bg_gradient.png deleted file mode 100644 index 89df7a93a9..0000000000 Binary files a/res/drawable-large-nodpi/customize_bg_gradient.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_folder.png b/res/drawable-mdpi/ic_launcher_folder.png deleted file mode 100644 index 08b4aad59c..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_folder.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_folder_open.png b/res/drawable-mdpi/ic_launcher_folder_open.png deleted file mode 100644 index b7640cb1a2..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_folder_open.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_shortcut.png b/res/drawable-mdpi/ic_launcher_shortcut.png deleted file mode 100644 index ba91360481..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_shortcut.png and /dev/null differ diff --git a/res/drawable-mdpi/trashcan.png b/res/drawable-mdpi/trashcan.png deleted file mode 100644 index f32bf27b0a..0000000000 Binary files a/res/drawable-mdpi/trashcan.png and /dev/null differ diff --git a/res/drawable-mdpi/trashcan_hover.png b/res/drawable-mdpi/trashcan_hover.png deleted file mode 100644 index bffa33fa6c..0000000000 Binary files a/res/drawable-mdpi/trashcan_hover.png and /dev/null differ diff --git a/res/drawable-mdpi/wallpaper_divider.png b/res/drawable-mdpi/wallpaper_divider.png deleted file mode 100644 index 1b453c5fa5..0000000000 Binary files a/res/drawable-mdpi/wallpaper_divider.png and /dev/null differ diff --git a/res/drawable-nodpi/apps_customize_bg_gradient.9.png b/res/drawable-nodpi/apps_customize_bg_gradient.9.png deleted file mode 100644 index e766bd65a8..0000000000 Binary files a/res/drawable-nodpi/apps_customize_bg_gradient.9.png and /dev/null differ diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index 53643b40a1..38973b564f 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -38,9 +38,9 @@ android:adjustViewBounds="true" android:scaleType="fitStart" /> - + Uninstall Manage - - - Shop \ No newline at end of file diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml index 9c1532aa04..7e19e89fae 100644 --- a/res/values-large/styles.xml +++ b/res/values-large/styles.xml @@ -42,10 +42,6 @@ false - - - - diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 7d2c741842..bda55919d2 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 6ddecf1ece..4061f19953 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;