Updating assets.
Change-Id: Ieab9698bbbe94a3087c9f405c4318f5575e2a842
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 0d80d16..c2e48e8 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -182,13 +182,13 @@
final Resources res = getResources();
mNormalBackground = res.getDrawable(R.drawable.homescreen_blue_normal_holo);
- mActiveBackground = res.getDrawable(R.drawable.homescreen_green_normal_holo);
- mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_green_strong_holo);
+ mActiveBackground = res.getDrawable(R.drawable.homescreen_blue_strong_holo);
+ mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_blue_strong_holo);
mNormalBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue);
mNormalGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong);
- mActiveBackgroundMini = res.getDrawable(R.drawable.homescreen_small_green);
- mActiveGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_green_strong);
+ mActiveBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong);
+ mActiveGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong);
mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left);
mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right);
mForegroundPadding =
diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/android/launcher2/Hotseat.java
index c53a743..f6ce059 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/android/launcher2/Hotseat.java
@@ -100,7 +100,7 @@
BubbleTextView allAppsButton = (BubbleTextView)
inflater.inflate(R.layout.application, mContent, false);
allAppsButton.setCompoundDrawablesWithIntrinsicBounds(null,
- context.getResources().getDrawable(R.drawable.apps_hotseat_button), null, null);
+ context.getResources().getDrawable(R.drawable.ic_allapps), null, null);
// allAppsButton.setText(context.getString(R.string.all_apps_button_label));
allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label));
allAppsButton.setOnClickListener(new View.OnClickListener() {
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 4fdb198..dca4d14 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -1807,7 +1807,7 @@
* fill its space on the track or not.
*/
protected boolean hasElasticScrollIndicator() {
- return false;
+ return true;
}
private void updateScrollingIndicator() {
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 71c3af6..6f952fa 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1221,19 +1221,23 @@
final int height = getHeight();
final int pageHeight = getChildAt(0).getHeight();
- // This determines the height of the glowing edge: 90% of the page height
- final int padding = (int) ((height - pageHeight) * 0.5f + pageHeight * 0.1f);
+ // Set the height of the outline to be the height of the page
+ final int offset = (height - pageHeight - mPaddingTop - mPaddingBottom) / 2;
+ final int paddingTop = mPaddingTop + offset;
+ final int paddingBottom = mPaddingBottom + offset;
final CellLayout leftPage = (CellLayout) getChildAt(mCurrentPage - 1);
final CellLayout rightPage = (CellLayout) getChildAt(mCurrentPage + 1);
if (leftPage != null && leftPage.getIsDragOverlapping()) {
final Drawable d = getResources().getDrawable(R.drawable.page_hover_left_holo);
- d.setBounds(mScrollX, padding, mScrollX + d.getIntrinsicWidth(), height - padding);
+ d.setBounds(mScrollX, paddingTop, mScrollX + d.getIntrinsicWidth(),
+ height - paddingBottom);
d.draw(canvas);
} else if (rightPage != null && rightPage.getIsDragOverlapping()) {
final Drawable d = getResources().getDrawable(R.drawable.page_hover_right_holo);
- d.setBounds(mScrollX + width - d.getIntrinsicWidth(), padding, mScrollX + width, height - padding);
+ d.setBounds(mScrollX + width - d.getIntrinsicWidth(), paddingTop, mScrollX + width,
+ height - paddingBottom);
d.draw(canvas);
}
}
@@ -3359,13 +3363,6 @@
mLauncher.getDragLayer().getLocationInDragLayer(this, loc);
}
- /**
- * Return true because we want the scrolling indicator to stretch to fit the space.
- */
- protected boolean hasElasticScrollIndicator() {
- return true;
- }
-
void showDockDivider(boolean immediately) {
final ViewGroup parent = (ViewGroup) getParent();
final View qsbDivider = (ImageView) (parent.findViewById(R.id.qsb_divider));