Adding drop shadow effect in allapps

Change-Id: Ic7a9b6e23d925d27a8dcbd418d2609e43917ac45
This commit is contained in:
Sunny Goyal 2015-05-14 19:24:40 -07:00
parent 312011094f
commit 4b6eb26950
7 changed files with 95 additions and 9 deletions

View File

@ -25,6 +25,5 @@
android:paddingBottom="@dimen/apps_icon_top_bottom_padding"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
launcher:deferShadowGeneration="true"
launcher:iconDisplay="all_apps" />

View File

@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.android.launcher3.AppsRecyclerViewContainer
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/apps_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -101,4 +102,4 @@
android:src="@drawable/ic_search_grey" />
</FrameLayout>
</FrameLayout>
</com.android.launcher3.AppsRecyclerViewContainer>

View File

@ -24,6 +24,5 @@
android:layout_weight="1"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
launcher:deferShadowGeneration="true"
launcher:iconDisplay="all_apps" />

View File

@ -1,3 +1,18 @@
/*
* Copyright (C) 2015 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.
*/
package com.android.launcher3;
import android.content.Context;

View File

@ -0,0 +1,61 @@
/*
* Copyright (C) 2015 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.
*/
package com.android.launcher3;
import android.content.Context;
import android.graphics.Bitmap;
import android.util.AttributeSet;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import com.android.launcher3.BubbleTextView.BubbleTextShadowHandler;
public class AppsRecyclerViewContainer extends FrameLayout implements BubbleTextShadowHandler {
private final ClickShadowView mTouchFeedbackView;
public AppsRecyclerViewContainer(Context context) {
this(context, null);
}
public AppsRecyclerViewContainer(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public AppsRecyclerViewContainer(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
mTouchFeedbackView = new ClickShadowView(context);
// Make the feedback view large enough to hold the blur bitmap.
int size = grid.allAppsIconSizePx + mTouchFeedbackView.getExtraSize();
addView(mTouchFeedbackView, size, size);
}
@Override
public void setPressedIcon(BubbleTextView icon, Bitmap background) {
if (icon == null || background == null) {
mTouchFeedbackView.setBitmap(null);
mTouchFeedbackView.animate().cancel();
} else if (mTouchFeedbackView.setBitmap(background)) {
mTouchFeedbackView.alignWithIconView(icon, (ViewGroup) icon.getParent());
mTouchFeedbackView.animateShadow();
}
}
}

View File

@ -33,6 +33,7 @@ import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
import android.view.ViewParent;
import android.widget.TextView;
import com.android.launcher3.IconCache.IconLoadRequest;
@ -274,9 +275,10 @@ public class BubbleTextView extends TextView {
}
// Only show the shadow effect when persistent pressed state is set.
if (getParent() instanceof ShortcutAndWidgetContainer) {
CellLayout layout = (CellLayout) getParent().getParent();
layout.setPressedIcon(this, mPressedBackground);
ViewParent parent = getParent();
if (parent != null && parent.getParent() instanceof BubbleTextShadowHandler) {
((BubbleTextShadowHandler) parent.getParent()).setPressedIcon(
this, mPressedBackground);
}
updateIconState();
@ -509,4 +511,11 @@ public class BubbleTextView extends TextView {
}
}
}
/**
* Interface to be implemented by the grand parent to allow click shadow effect.
*/
public static interface BubbleTextShadowHandler {
void setPressedIcon(BubbleTextView icon, Bitmap background);
}
}

View File

@ -47,6 +47,7 @@ import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.DecelerateInterpolator;
import com.android.launcher3.BubbleTextView.BubbleTextShadowHandler;
import com.android.launcher3.FolderIcon.FolderRingAnimator;
import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;
import com.android.launcher3.accessibility.FolderAccessibilityHelper;
@ -61,7 +62,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Stack;
public class CellLayout extends ViewGroup {
public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
public static final int WORKSPACE_ACCESSIBILITY_DRAG = 2;
public static final int FOLDER_ACCESSIBILITY_DRAG = 1;
@ -409,7 +410,8 @@ public class CellLayout extends ViewGroup {
invalidate();
}
void setPressedIcon(BubbleTextView icon, Bitmap background) {
@Override
public void setPressedIcon(BubbleTextView icon, Bitmap background) {
if (icon == null || background == null) {
mTouchFeedbackView.setBitmap(null);
mTouchFeedbackView.animate().cancel();