summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-06-11 10:36:14 -0700
committerAdam Cohen <adamcohen@google.com>2014-06-11 10:50:41 -0700
commit71b0473f24a7d77263aae88139f13298a1d64b27 (patch)
tree6f856e8793539ad80011309a5a3dcee75ace79f9 /src
parentada8d7dfe1a52eab1e2a0954cf369ed6d198de94 (diff)
downloadandroid_packages_apps_Trebuchet-71b0473f24a7d77263aae88139f13298a1d64b27.tar.gz
android_packages_apps_Trebuchet-71b0473f24a7d77263aae88139f13298a1d64b27.tar.bz2
android_packages_apps_Trebuchet-71b0473f24a7d77263aae88139f13298a1d64b27.zip
Add new assets for LMP preview
issue 15544569 c), d), e) Change-Id: Ib352ef1fa7c19c3695c82f3ea31936a4b41da5aa
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/CellLayout.java5
-rw-r--r--src/com/android/launcher3/Hotseat.java5
-rw-r--r--src/com/android/launcher3/Launcher.java13
3 files changed, 23 insertions, 0 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 8ca8d9105..a0c9c2ed9 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 2ac2f00a8..4b2543328 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 9ebb9970a..e5a17c0d7 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();