Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add shadow under tabs when user has scrolled up in sharesheet" into rvc-dev am: 7ae10c0737

Browse Source 
Change-Id: Id84c56850f1241dd9bdd59fac1dd841f78035e30
This commit is contained in:
TreeHugger Robot
2020-04-22 19:54:29 +00:00
committed by Automerger Merge Worker
parent d93803d31f 7ae10c0737
commit fcccc485fa
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2721,11 +2721,12 @@ public class ChooserActivity extends ResolverActivity implements
} }
private void setupScrollListener() { private void setupScrollListener() {
if (mResolverDrawerLayout == null || shouldShowTabs()) { if (mResolverDrawerLayout == null) {
return; return;
} }
final View chooserHeader = mResolverDrawerLayout.findViewById(R.id.chooser_header); int elevatedViewResId = shouldShowTabs() ? R.id.resolver_tab_divider : R.id.chooser_header;
final float defaultElevation = chooserHeader.getElevation(); final View elevatedView = mResolverDrawerLayout.findViewById(elevatedViewResId);
final float defaultElevation = elevatedView.getElevation();
final float chooserHeaderScrollElevation = final float chooserHeaderScrollElevation =
getResources().getDimensionPixelSize(R.dimen.chooser_header_scroll_elevation); getResources().getDimensionPixelSize(R.dimen.chooser_header_scroll_elevation);
@@ -2738,12 +2739,12 @@ public class ChooserActivity extends ResolverActivity implements
if (view.getChildCount() > 0) { if (view.getChildCount() > 0) {
View child = view.getLayoutManager().findViewByPosition(0); View child = view.getLayoutManager().findViewByPosition(0);
if (child == null || child.getTop() < 0) { if (child == null || child.getTop() < 0) {
chooserHeader.setElevation(chooserHeaderScrollElevation); elevatedView.setElevation(chooserHeaderScrollElevation);
return; return;
} }
} }
chooserHeader.setElevation(defaultElevation); elevatedView.setElevation(defaultElevation);
} }
}); });
} }