diff options
author | Adam Cohen <adamcohen@google.com> | 2014-07-09 23:53:15 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-07-18 17:56:42 -0700 |
commit | 6c5891a9fce95eee3d87823d11d21889743e9c68 (patch) | |
tree | 3373b4ee43895f19ae90f472a3b42d12b1ab3634 /src/com/android/launcher3/AppsCustomizePagedView.java | |
parent | cc83d8dbfe2d99d95d9cf651c9559093d3c89c1e (diff) | |
download | android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.tar.gz android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.tar.bz2 android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.zip |
Preliminary work on Material Transitions
-> Early exploration of AllApps Hero transition with
circular reveal
-> Stripping a bunch of dead code from AppsCustomizeTabHost
-> Moved background scrim to DragLayer
-> Removed "SMALL" state from workspace: replaced with
NORMAL_HIDDEN and OVERVIEW_HIDDEN. This is mainly to
reduce the overall usage of the z-space model between
allapps/widgets and workspace. There are vestigial
remains of this model, mainly due to the overview
mode, and a bit for spring-loaded.
Change-Id: If2302a24394f0ec66621f01ffa2fc4934aa10c3f
Diffstat (limited to 'src/com/android/launcher3/AppsCustomizePagedView.java')
-rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 2520b8a12..0e9969697 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -377,8 +377,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen int heightSpec = MeasureSpec.makeMeasureSpec(mContentHeight, MeasureSpec.AT_MOST); mWidgetSpacingLayout.measure(widthSpec, heightSpec); - AppsCustomizeTabHost host = (AppsCustomizeTabHost) getTabHost(); - final boolean hostIsTransitioning = host.isTransitioning(); + final boolean hostIsTransitioning = getTabHost().isInTransition(); // Restore the page int page = getPageForComponent(mSaveInstanceStateItemIndex); @@ -1617,12 +1616,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // If we have reset, then we should not continue to restore the previous state mSaveInstanceStateItemIndex = -1; - AppsCustomizeTabHost tabHost = getTabHost(); - String tag = tabHost.getCurrentTabTag(); - if (tag != null) { - if (!tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) { - tabHost.setCurrentTabFromContent(ContentType.Applications); - } + if (mContentType != ContentType.Applications) { + setContentType(ContentType.Applications); } if (mCurrentPage != 0) { |