diff --git a/res/drawable-hdpi/ic_allapps_l.png b/res/drawable-hdpi/ic_allapps_l.png new file mode 100644 index 0000000000..4fe3bf0e67 Binary files /dev/null and b/res/drawable-hdpi/ic_allapps_l.png differ diff --git a/res/drawable-hdpi/ic_allapps_pressed_l.png b/res/drawable-hdpi/ic_allapps_pressed_l.png new file mode 100644 index 0000000000..af49dbb416 Binary files /dev/null and b/res/drawable-hdpi/ic_allapps_pressed_l.png differ diff --git a/res/drawable-hdpi/ic_setting_l.png b/res/drawable-hdpi/ic_setting_l.png new file mode 100644 index 0000000000..1c12a5b803 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_l.png differ diff --git a/res/drawable-hdpi/ic_setting_pressed_l.png b/res/drawable-hdpi/ic_setting_pressed_l.png new file mode 100644 index 0000000000..d5b5ca2044 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_pressed_l.png differ diff --git a/res/drawable-hdpi/ic_wallpaper_l.png b/res/drawable-hdpi/ic_wallpaper_l.png new file mode 100644 index 0000000000..34d5943360 Binary files /dev/null and b/res/drawable-hdpi/ic_wallpaper_l.png differ diff --git a/res/drawable-hdpi/ic_wallpaper_pressed_l.png b/res/drawable-hdpi/ic_wallpaper_pressed_l.png new file mode 100644 index 0000000000..1588ce7174 Binary files /dev/null and b/res/drawable-hdpi/ic_wallpaper_pressed_l.png differ diff --git a/res/drawable-hdpi/ic_widget_l.png b/res/drawable-hdpi/ic_widget_l.png new file mode 100644 index 0000000000..ed7e1ca0d1 Binary files /dev/null and b/res/drawable-hdpi/ic_widget_l.png differ diff --git a/res/drawable-hdpi/ic_widget_pressed_l.png b/res/drawable-hdpi/ic_widget_pressed_l.png new file mode 100644 index 0000000000..19d6feded4 Binary files /dev/null and b/res/drawable-hdpi/ic_widget_pressed_l.png differ diff --git a/res/drawable-hdpi/screenpanel_hover_l.9.png b/res/drawable-hdpi/screenpanel_hover_l.9.png new file mode 100644 index 0000000000..2cea8a4718 Binary files /dev/null and b/res/drawable-hdpi/screenpanel_hover_l.9.png differ diff --git a/res/drawable-hdpi/screenpanel_l.9.png b/res/drawable-hdpi/screenpanel_l.9.png new file mode 100644 index 0000000000..eed0f2cbb6 Binary files /dev/null and b/res/drawable-hdpi/screenpanel_l.9.png differ diff --git a/res/drawable-mdpi/ic_allapps_l.png b/res/drawable-mdpi/ic_allapps_l.png new file mode 100644 index 0000000000..09cd82af91 Binary files /dev/null and b/res/drawable-mdpi/ic_allapps_l.png differ diff --git a/res/drawable-mdpi/ic_allapps_pressed_l.png b/res/drawable-mdpi/ic_allapps_pressed_l.png new file mode 100644 index 0000000000..d7ea96f61d Binary files /dev/null and b/res/drawable-mdpi/ic_allapps_pressed_l.png differ diff --git a/res/drawable-mdpi/ic_setting_l.png b/res/drawable-mdpi/ic_setting_l.png new file mode 100644 index 0000000000..c614e91830 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_l.png differ diff --git a/res/drawable-mdpi/ic_setting_pressed_l.png b/res/drawable-mdpi/ic_setting_pressed_l.png new file mode 100644 index 0000000000..61e574ad16 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_pressed_l.png differ diff --git a/res/drawable-mdpi/ic_wallpaper_l.png b/res/drawable-mdpi/ic_wallpaper_l.png new file mode 100644 index 0000000000..8f2a00a3f8 Binary files /dev/null and b/res/drawable-mdpi/ic_wallpaper_l.png differ diff --git a/res/drawable-mdpi/ic_wallpaper_pressed_l.png b/res/drawable-mdpi/ic_wallpaper_pressed_l.png new file mode 100644 index 0000000000..aa598c3e25 Binary files /dev/null and b/res/drawable-mdpi/ic_wallpaper_pressed_l.png differ diff --git a/res/drawable-mdpi/ic_widget_l.png b/res/drawable-mdpi/ic_widget_l.png new file mode 100644 index 0000000000..1bd3935033 Binary files /dev/null and b/res/drawable-mdpi/ic_widget_l.png differ diff --git a/res/drawable-mdpi/ic_widget_pressed_l.png b/res/drawable-mdpi/ic_widget_pressed_l.png new file mode 100644 index 0000000000..9b690d99b2 Binary files /dev/null and b/res/drawable-mdpi/ic_widget_pressed_l.png differ diff --git a/res/drawable-mdpi/screenpanel_hover_l.9.png b/res/drawable-mdpi/screenpanel_hover_l.9.png new file mode 100644 index 0000000000..8a94984f5e Binary files /dev/null and b/res/drawable-mdpi/screenpanel_hover_l.9.png differ diff --git a/res/drawable-mdpi/screenpanel_l.9.png b/res/drawable-mdpi/screenpanel_l.9.png new file mode 100644 index 0000000000..6f8b7e6a1c Binary files /dev/null and b/res/drawable-mdpi/screenpanel_l.9.png differ diff --git a/res/drawable-xhdpi/ic_allapps_l.png b/res/drawable-xhdpi/ic_allapps_l.png new file mode 100644 index 0000000000..eff3bea5dd Binary files /dev/null and b/res/drawable-xhdpi/ic_allapps_l.png differ diff --git a/res/drawable-xhdpi/ic_allapps_pressed_l.png b/res/drawable-xhdpi/ic_allapps_pressed_l.png new file mode 100644 index 0000000000..15a8aa964b Binary files /dev/null and b/res/drawable-xhdpi/ic_allapps_pressed_l.png differ diff --git a/res/drawable-xhdpi/ic_setting_l.png b/res/drawable-xhdpi/ic_setting_l.png new file mode 100644 index 0000000000..3a7310b7c7 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_l.png differ diff --git a/res/drawable-xhdpi/ic_setting_pressed_l.png b/res/drawable-xhdpi/ic_setting_pressed_l.png new file mode 100644 index 0000000000..005d49c8c9 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_pressed_l.png differ diff --git a/res/drawable-xhdpi/ic_wallpaper_l.png b/res/drawable-xhdpi/ic_wallpaper_l.png new file mode 100644 index 0000000000..d2bf246ee6 Binary files /dev/null and b/res/drawable-xhdpi/ic_wallpaper_l.png differ diff --git a/res/drawable-xhdpi/ic_wallpaper_pressed_l.png b/res/drawable-xhdpi/ic_wallpaper_pressed_l.png new file mode 100644 index 0000000000..5a9b84d7d0 Binary files /dev/null and b/res/drawable-xhdpi/ic_wallpaper_pressed_l.png differ diff --git a/res/drawable-xhdpi/ic_widget_l.png b/res/drawable-xhdpi/ic_widget_l.png new file mode 100644 index 0000000000..cf6be81738 Binary files /dev/null and b/res/drawable-xhdpi/ic_widget_l.png differ diff --git a/res/drawable-xhdpi/ic_widget_pressed_l.png b/res/drawable-xhdpi/ic_widget_pressed_l.png new file mode 100644 index 0000000000..633c9c648f Binary files /dev/null and b/res/drawable-xhdpi/ic_widget_pressed_l.png differ diff --git a/res/drawable-xhdpi/screenpanel_hover_l.9.png b/res/drawable-xhdpi/screenpanel_hover_l.9.png new file mode 100644 index 0000000000..0032fff4dc Binary files /dev/null and b/res/drawable-xhdpi/screenpanel_hover_l.9.png differ diff --git a/res/drawable-xhdpi/screenpanel_l.9.png b/res/drawable-xhdpi/screenpanel_l.9.png new file mode 100644 index 0000000000..2d70d7af56 Binary files /dev/null and b/res/drawable-xhdpi/screenpanel_l.9.png differ diff --git a/res/drawable-xxhdpi/ic_allapps_l.png b/res/drawable-xxhdpi/ic_allapps_l.png new file mode 100644 index 0000000000..2461984fff Binary files /dev/null and b/res/drawable-xxhdpi/ic_allapps_l.png differ diff --git a/res/drawable-xxhdpi/ic_allapps_pressed_l.png b/res/drawable-xxhdpi/ic_allapps_pressed_l.png new file mode 100644 index 0000000000..929a0e6abe Binary files /dev/null and b/res/drawable-xxhdpi/ic_allapps_pressed_l.png differ diff --git a/res/drawable-xxhdpi/ic_setting_l.png b/res/drawable-xxhdpi/ic_setting_l.png new file mode 100644 index 0000000000..01bdcd5448 Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_l.png differ diff --git a/res/drawable-xxhdpi/ic_setting_pressed_l.png b/res/drawable-xxhdpi/ic_setting_pressed_l.png new file mode 100644 index 0000000000..d0cad5e0e8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_pressed_l.png differ diff --git a/res/drawable-xxhdpi/ic_wallpaper_l.png b/res/drawable-xxhdpi/ic_wallpaper_l.png new file mode 100644 index 0000000000..490c45a871 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wallpaper_l.png differ diff --git a/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png b/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png new file mode 100644 index 0000000000..e5d200be14 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png differ diff --git a/res/drawable-xxhdpi/ic_widget_l.png b/res/drawable-xxhdpi/ic_widget_l.png new file mode 100644 index 0000000000..d4b8324b1f Binary files /dev/null and b/res/drawable-xxhdpi/ic_widget_l.png differ diff --git a/res/drawable-xxhdpi/ic_widget_pressed_l.png b/res/drawable-xxhdpi/ic_widget_pressed_l.png new file mode 100644 index 0000000000..b8dd35dc6b Binary files /dev/null and b/res/drawable-xxhdpi/ic_widget_pressed_l.png differ diff --git a/res/drawable-xxhdpi/screenpanel_hover_l.9.png b/res/drawable-xxhdpi/screenpanel_hover_l.9.png new file mode 100644 index 0000000000..24d2266a0d Binary files /dev/null and b/res/drawable-xxhdpi/screenpanel_hover_l.9.png differ diff --git a/res/drawable-xxhdpi/screenpanel_l.9.png b/res/drawable-xxhdpi/screenpanel_l.9.png new file mode 100644 index 0000000000..7ed058efaa Binary files /dev/null and b/res/drawable-xxhdpi/screenpanel_l.9.png differ diff --git a/res/drawable/all_apps_button_icon_l.xml b/res/drawable/all_apps_button_icon_l.xml new file mode 100644 index 0000000000..91de1b5cd1 --- /dev/null +++ b/res/drawable/all_apps_button_icon_l.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/res/drawable/setting_button_l.xml b/res/drawable/setting_button_l.xml new file mode 100644 index 0000000000..01661db403 --- /dev/null +++ b/res/drawable/setting_button_l.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/res/drawable/wallpaper_button_l.xml b/res/drawable/wallpaper_button_l.xml new file mode 100644 index 0000000000..c539b6124d --- /dev/null +++ b/res/drawable/wallpaper_button_l.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/res/drawable/widget_button_l.xml b/res/drawable/widget_button_l.xml new file mode 100644 index 0000000000..92521b9f23 --- /dev/null +++ b/res/drawable/widget_button_l.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 8ca8d91059..a0c9c2ed9c 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -217,6 +217,11 @@ public class CellLayout extends ViewGroup { mNormalBackground = res.getDrawable(R.drawable.screenpanel); mActiveGlowBackground = res.getDrawable(R.drawable.screenpanel_hover); + if (Utilities.isLmp()) { + mNormalBackground = res.getDrawable(R.drawable.screenpanel_l); + mActiveGlowBackground = res.getDrawable(R.drawable.screenpanel_hover_l); + } + mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left); mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right); mForegroundPadding = diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 2ac2f00a87..4b2543328f 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -150,6 +150,11 @@ public class Hotseat extends FrameLayout { TextView allAppsButton = (TextView) inflater.inflate(R.layout.all_apps_button, mContent, false); Drawable d = context.getResources().getDrawable(R.drawable.all_apps_button_icon); + + if (Utilities.isLmp()) { + d = context.getResources().getDrawable(R.drawable.all_apps_button_icon_l); + } + Utilities.resizeIconDrawable(d); allAppsButton.setCompoundDrawables(null, d, null, null); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 9ebb9970ae..e5a17c0d7e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1292,6 +1292,10 @@ public class Launcher extends Activity } }); widgetButton.setOnTouchListener(getHapticFeedbackTouchListener()); + if (Utilities.isLmp()) { + ((TextView) widgetButton).setCompoundDrawablesWithIntrinsicBounds(0, + R.drawable.widget_button_l, 0, 0); + } View wallpaperButton = findViewById(R.id.wallpaper_button); wallpaperButton.setOnClickListener(new OnClickListener() { @@ -1304,6 +1308,11 @@ public class Launcher extends Activity }); wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener()); + if (Utilities.isLmp()) { + ((TextView) wallpaperButton).setCompoundDrawablesWithIntrinsicBounds(0, + R.drawable.wallpaper_button_l, 0, 0); + } + View settingsButton = findViewById(R.id.settings_button); if (hasSettings()) { settingsButton.setOnClickListener(new OnClickListener() { @@ -1315,6 +1324,10 @@ public class Launcher extends Activity } }); settingsButton.setOnTouchListener(getHapticFeedbackTouchListener()); + if (Utilities.isLmp()) { + ((TextView) settingsButton).setCompoundDrawablesWithIntrinsicBounds(0, + R.drawable.setting_button_l, 0, 0); + } } else { settingsButton.setVisibility(View.GONE); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) widgetButton.getLayoutParams();