diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-03 15:31:25 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-23 12:06:16 -0800 |
commit | 32554d1c6169df944f651846c64096f8bb57fb31 (patch) | |
tree | 8b40acce1d9e5a3e43d715fac10a4ddf86aec87f /src/com/android/launcher3/testing | |
parent | 261194387beebaa7927ec4e310274218b651494d (diff) | |
download | android_packages_apps_Trebuchet-32554d1c6169df944f651846c64096f8bb57fb31.tar.gz android_packages_apps_Trebuchet-32554d1c6169df944f651846c64096f8bb57fb31.tar.bz2 android_packages_apps_Trebuchet-32554d1c6169df944f651846c64096f8bb57fb31.zip |
Cleaning up the overlay interface
Removing some unnecessary and unused methods
Bug: 25993953
Change-Id: I4d715cdee04eb7b0ebef673d885a4258c521ff1f
Diffstat (limited to 'src/com/android/launcher3/testing')
-rw-r--r-- | src/com/android/launcher3/testing/LauncherExtension.java | 138 |
1 files changed, 2 insertions, 136 deletions
diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java index 89821768c..279be7037 100644 --- a/src/com/android/launcher3/testing/LauncherExtension.java +++ b/src/com/android/launcher3/testing/LauncherExtension.java @@ -1,24 +1,16 @@ package com.android.launcher3.testing; -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ObjectAnimator; -import android.content.ComponentName; import android.content.Intent; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; import android.view.Menu; import android.view.View; -import android.view.ViewGroup; import android.widget.FrameLayout; import com.android.launcher3.AppInfo; -import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.LauncherCallbacks; -import com.android.launcher3.R; import com.android.launcher3.allapps.AllAppsSearchBarController; import com.android.launcher3.util.ComponentKey; @@ -42,8 +34,6 @@ public class LauncherExtension extends Launcher { public class LauncherExtensionCallbacks implements LauncherCallbacks { - LauncherExtensionOverlay mLauncherOverlay = new LauncherExtensionOverlay(); - @Override public void preOnCreate() { } @@ -116,10 +106,6 @@ public class LauncherExtension extends Launcher { @Override public boolean handleBackPressed() { - if (mLauncherOverlay.isOverlayPanelShowing()) { - mLauncherOverlay.hideOverlayPanel(); - return true; - } return false; } @@ -188,13 +174,8 @@ public class LauncherExtension extends Launcher { } @Override - public boolean forceDisableVoiceButtonProxy() { - return false; - } - - @Override public boolean providesSearch() { - return true; + return false; } @Override @@ -208,10 +189,6 @@ public class LauncherExtension extends Launcher { return false; } - @Override - public void startVoice() { - } - CustomContentCallbacks mCustomContentCallbacks = new CustomContentCallbacks() { // Custom content is completely shown. {@code fromResume} indicates whether this was caused @@ -249,7 +226,7 @@ public class LauncherExtension extends Launcher { @Override public View getQsbBar() { - return mLauncherOverlay.getSearchBox(); + return null; } @Override @@ -288,11 +265,6 @@ public class LauncherExtension extends Launcher { } @Override - public ComponentName getWallpaperPickerComponent() { - return null; - } - - @Override public boolean overrideWallpaperDimensions() { return false; } @@ -318,114 +290,8 @@ public class LauncherExtension extends Launcher { } @Override - public boolean hasLauncherOverlay() { - return false; - } - - @Override - public LauncherOverlay setLauncherOverlayView(InsettableFrameLayout container, - LauncherOverlayCallbacks callbacks) { - - mLauncherOverlay.setOverlayCallbacks(callbacks); - mLauncherOverlay.setOverlayContainer(container); - - return mLauncherOverlay; - } - - @Override public void setLauncherSearchCallback(Object callbacks) { // Do nothing } - - class LauncherExtensionOverlay implements LauncherOverlay { - LauncherOverlayCallbacks mLauncherOverlayCallbacks; - ViewGroup mOverlayView; - View mSearchBox; - View mSearchOverlay; - boolean mShowOverlayFeedback; - int mProgress; - boolean mOverlayPanelShowing; - - @Override - public void onScrollInteractionBegin() { - if (mLauncherOverlayCallbacks.canEnterFullImmersion()) { - mShowOverlayFeedback = true; - updatePanelOffset(0); - mSearchOverlay.setVisibility(View.VISIBLE); - mSearchOverlay.setLayerType(View.LAYER_TYPE_HARDWARE, null); - } - } - - @Override - public void onScrollChange(int progress, boolean rtl) { - mProgress = progress; - if (mShowOverlayFeedback) { - updatePanelOffset(progress); - } - } - - private void updatePanelOffset(int progress) { - int panelWidth = mSearchOverlay.getMeasuredWidth(); - int offset = (int) ((progress / 100f) * panelWidth); - mSearchOverlay.setTranslationX(- panelWidth + offset); - } - - @Override - public void onScrollInteractionEnd() { - if (mProgress > 25 && mLauncherOverlayCallbacks.enterFullImmersion()) { - ObjectAnimator oa = LauncherAnimUtils.ofFloat( - mSearchOverlay, View.TRANSLATION_X, 0); - oa.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator arg0) { - mSearchOverlay.setLayerType(View.LAYER_TYPE_NONE, null); - } - }); - oa.start(); - mOverlayPanelShowing = true; - mShowOverlayFeedback = false; - } - } - - @Override - public void onScrollSettled() { - if (mShowOverlayFeedback) { - mSearchOverlay.setVisibility(View.INVISIBLE); - mSearchOverlay.setLayerType(View.LAYER_TYPE_NONE, null); - } - mShowOverlayFeedback = false; - mProgress = 0; - } - - public void hideOverlayPanel() { - mLauncherOverlayCallbacks.exitFullImmersion(); - mSearchOverlay.setVisibility(View.INVISIBLE); - mOverlayPanelShowing = false; - } - - public boolean isOverlayPanelShowing() { - return mOverlayPanelShowing; - } - - @Override - public void forceExitFullImmersion() { - hideOverlayPanel(); - } - - public void setOverlayContainer(InsettableFrameLayout container) { - mOverlayView = (ViewGroup) getLayoutInflater().inflate( - R.layout.launcher_overlay_example, container); - mSearchOverlay = mOverlayView.findViewById(R.id.search_overlay); - mSearchBox = mOverlayView.findViewById(R.id.search_box); - } - - public View getSearchBox() { - return mSearchBox; - } - - public void setOverlayCallbacks(LauncherOverlayCallbacks callbacks) { - mLauncherOverlayCallbacks = callbacks; - } - }; } } |