Add new assets for LMP preview
issue 15544569 c), d), e)
Change-Id: Ib352ef1fa7c19c3695c82f3ea31936a4b41da5aa
diff --git a/res/drawable-hdpi/ic_allapps_l.png b/res/drawable-hdpi/ic_allapps_l.png
new file mode 100644
index 0000000..4fe3bf0
--- /dev/null
+++ b/res/drawable-hdpi/ic_allapps_l.png
Binary files 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 0000000..af49dbb
--- /dev/null
+++ b/res/drawable-hdpi/ic_allapps_pressed_l.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_setting_l.png b/res/drawable-hdpi/ic_setting_l.png
new file mode 100644
index 0000000..1c12a5b
--- /dev/null
+++ b/res/drawable-hdpi/ic_setting_l.png
Binary files 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 0000000..d5b5ca2
--- /dev/null
+++ b/res/drawable-hdpi/ic_setting_pressed_l.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wallpaper_l.png b/res/drawable-hdpi/ic_wallpaper_l.png
new file mode 100644
index 0000000..34d5943
--- /dev/null
+++ b/res/drawable-hdpi/ic_wallpaper_l.png
Binary files 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 0000000..1588ce7
--- /dev/null
+++ b/res/drawable-hdpi/ic_wallpaper_pressed_l.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_widget_l.png b/res/drawable-hdpi/ic_widget_l.png
new file mode 100644
index 0000000..ed7e1ca
--- /dev/null
+++ b/res/drawable-hdpi/ic_widget_l.png
Binary files 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 0000000..19d6fed
--- /dev/null
+++ b/res/drawable-hdpi/ic_widget_pressed_l.png
Binary files 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 0000000..2cea8a4
--- /dev/null
+++ b/res/drawable-hdpi/screenpanel_hover_l.9.png
Binary files differ
diff --git a/res/drawable-hdpi/screenpanel_l.9.png b/res/drawable-hdpi/screenpanel_l.9.png
new file mode 100644
index 0000000..eed0f2c
--- /dev/null
+++ b/res/drawable-hdpi/screenpanel_l.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps_l.png b/res/drawable-mdpi/ic_allapps_l.png
new file mode 100644
index 0000000..09cd82a
--- /dev/null
+++ b/res/drawable-mdpi/ic_allapps_l.png
Binary files 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 0000000..d7ea96f
--- /dev/null
+++ b/res/drawable-mdpi/ic_allapps_pressed_l.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_setting_l.png b/res/drawable-mdpi/ic_setting_l.png
new file mode 100644
index 0000000..c614e91
--- /dev/null
+++ b/res/drawable-mdpi/ic_setting_l.png
Binary files 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 0000000..61e574a
--- /dev/null
+++ b/res/drawable-mdpi/ic_setting_pressed_l.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wallpaper_l.png b/res/drawable-mdpi/ic_wallpaper_l.png
new file mode 100644
index 0000000..8f2a00a
--- /dev/null
+++ b/res/drawable-mdpi/ic_wallpaper_l.png
Binary files 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 0000000..aa598c3
--- /dev/null
+++ b/res/drawable-mdpi/ic_wallpaper_pressed_l.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget_l.png b/res/drawable-mdpi/ic_widget_l.png
new file mode 100644
index 0000000..1bd3935
--- /dev/null
+++ b/res/drawable-mdpi/ic_widget_l.png
Binary files 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 0000000..9b690d9
--- /dev/null
+++ b/res/drawable-mdpi/ic_widget_pressed_l.png
Binary files 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 0000000..8a94984
--- /dev/null
+++ b/res/drawable-mdpi/screenpanel_hover_l.9.png
Binary files differ
diff --git a/res/drawable-mdpi/screenpanel_l.9.png b/res/drawable-mdpi/screenpanel_l.9.png
new file mode 100644
index 0000000..6f8b7e6
--- /dev/null
+++ b/res/drawable-mdpi/screenpanel_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps_l.png b/res/drawable-xhdpi/ic_allapps_l.png
new file mode 100644
index 0000000..eff3bea
--- /dev/null
+++ b/res/drawable-xhdpi/ic_allapps_l.png
Binary files 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 0000000..15a8aa9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_allapps_pressed_l.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_setting_l.png b/res/drawable-xhdpi/ic_setting_l.png
new file mode 100644
index 0000000..3a7310b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_setting_l.png
Binary files 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 0000000..005d49c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_setting_pressed_l.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wallpaper_l.png b/res/drawable-xhdpi/ic_wallpaper_l.png
new file mode 100644
index 0000000..d2bf246
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wallpaper_l.png
Binary files 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 0000000..5a9b84d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wallpaper_pressed_l.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget_l.png b/res/drawable-xhdpi/ic_widget_l.png
new file mode 100644
index 0000000..cf6be81
--- /dev/null
+++ b/res/drawable-xhdpi/ic_widget_l.png
Binary files 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 0000000..633c9c6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_widget_pressed_l.png
Binary files 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 0000000..0032fff
--- /dev/null
+++ b/res/drawable-xhdpi/screenpanel_hover_l.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/screenpanel_l.9.png b/res/drawable-xhdpi/screenpanel_l.9.png
new file mode 100644
index 0000000..2d70d7a
--- /dev/null
+++ b/res/drawable-xhdpi/screenpanel_l.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps_l.png b/res/drawable-xxhdpi/ic_allapps_l.png
new file mode 100644
index 0000000..2461984
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_allapps_l.png
Binary files 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 0000000..929a0e6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_allapps_pressed_l.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_setting_l.png b/res/drawable-xxhdpi/ic_setting_l.png
new file mode 100644
index 0000000..01bdcd5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_setting_l.png
Binary files 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 0000000..d0cad5e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_setting_pressed_l.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wallpaper_l.png b/res/drawable-xxhdpi/ic_wallpaper_l.png
new file mode 100644
index 0000000..490c45a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wallpaper_l.png
Binary files 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 0000000..e5d200b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wallpaper_pressed_l.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget_l.png b/res/drawable-xxhdpi/ic_widget_l.png
new file mode 100644
index 0000000..d4b8324
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_widget_l.png
Binary files 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 0000000..b8dd35d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_widget_pressed_l.png
Binary files 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 0000000..24d2266
--- /dev/null
+++ b/res/drawable-xxhdpi/screenpanel_hover_l.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/screenpanel_l.9.png b/res/drawable-xxhdpi/screenpanel_l.9.png
new file mode 100644
index 0000000..7ed058e
--- /dev/null
+++ b/res/drawable-xxhdpi/screenpanel_l.9.png
Binary files 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 0000000..91de1b5
--- /dev/null
+++ b/res/drawable/all_apps_button_icon_l.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_focused="true" android:drawable="@drawable/ic_allapps_pressed_l" />
+ <item android:state_pressed="true" android:drawable="@drawable/ic_allapps_pressed_l" />
+ <item android:drawable="@drawable/ic_allapps_l" />
+</selector>
diff --git a/res/drawable/setting_button_l.xml b/res/drawable/setting_button_l.xml
new file mode 100644
index 0000000..01661db
--- /dev/null
+++ b/res/drawable/setting_button_l.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_focused="true" android:drawable="@drawable/ic_setting_pressed_l" />
+ <item android:state_pressed="true" android:drawable="@drawable/ic_setting_pressed_l" />
+ <item android:drawable="@drawable/ic_setting_l" />
+</selector>
diff --git a/res/drawable/wallpaper_button_l.xml b/res/drawable/wallpaper_button_l.xml
new file mode 100644
index 0000000..c539b61
--- /dev/null
+++ b/res/drawable/wallpaper_button_l.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_focused="true" android:drawable="@drawable/ic_wallpaper_pressed_l" />
+ <item android:state_pressed="true" android:drawable="@drawable/ic_wallpaper_pressed_l" />
+ <item android:drawable="@drawable/ic_wallpaper_l" />
+</selector>
diff --git a/res/drawable/widget_button_l.xml b/res/drawable/widget_button_l.xml
new file mode 100644
index 0000000..92521b9
--- /dev/null
+++ b/res/drawable/widget_button_l.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_focused="true" android:drawable="@drawable/ic_widget_pressed_l" />
+ <item android:state_pressed="true" android:drawable="@drawable/ic_widget_pressed_l" />
+ <item android:drawable="@drawable/ic_widget_l" />
+</selector>
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 8ca8d91..a0c9c2e 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -217,6 +217,11 @@
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 2ac2f00..4b25433 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -150,6 +150,11 @@
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 9ebb997..e5a17c0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1292,6 +1292,10 @@
}
});
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 @@
});
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 @@
}
});
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();
