diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-12-05 16:56:18 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-12-05 16:57:48 -0800 |
commit | e969c68c7e8e96e9ce501138868226bcbf2307f7 (patch) | |
tree | 510f894569684fbe8e7dd715c9e47eb00391afc6 /src/com/android/launcher3/pageindicators | |
parent | 7d6b4fa47cbbb2e0c0dd8bdc01f2d0d61fb1dad4 (diff) | |
download | android_packages_apps_Trebuchet-e969c68c7e8e96e9ce501138868226bcbf2307f7.tar.gz android_packages_apps_Trebuchet-e969c68c7e8e96e9ce501138868226bcbf2307f7.tar.bz2 android_packages_apps_Trebuchet-e969c68c7e8e96e9ce501138868226bcbf2307f7.zip |
Removing horizontal bar from page indicator
> Removing the clickable bar from pageIndicator in portrait view
> Moving onClick logic to respective classes
Change-Id: I83a8df90d8c5442890bc09fdda17a82b9d134b8a
Diffstat (limited to 'src/com/android/launcher3/pageindicators')
3 files changed, 22 insertions, 34 deletions
diff --git a/src/com/android/launcher3/pageindicators/PageIndicator.java b/src/com/android/launcher3/pageindicators/PageIndicator.java index be6bcc582..5e3d21600 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicator.java +++ b/src/com/android/launcher3/pageindicators/PageIndicator.java @@ -17,18 +17,17 @@ package com.android.launcher3.pageindicators; import android.content.Context; import android.util.AttributeSet; -import android.widget.FrameLayout; +import android.view.View; /** * Base class for a page indicator. */ -public abstract class PageIndicator extends FrameLayout { +public abstract class PageIndicator extends View { protected int mNumPages = 1; public PageIndicator(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setWillNotDraw(false); } public void setScroll(int currentScroll, int totalScroll) {} diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorLandscape.java b/src/com/android/launcher3/pageindicators/PageIndicatorLandscape.java index 7325235db..2d5a4a938 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorLandscape.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorLandscape.java @@ -15,17 +15,23 @@ */ package com.android.launcher3.pageindicators; +import static com.android.launcher3.LauncherState.ALL_APPS; + import android.content.Context; import android.util.AttributeSet; +import android.view.View; +import android.view.View.OnClickListener; import com.android.launcher3.Launcher; +import com.android.launcher3.userevent.nano.LauncherLogProto.Action; +import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType; /** * Simply draws the caret drawable bottom-right aligned in the view. This ensures that we can have * a view with as large an area as we want (for touching) while maintaining a caret of size * all_apps_caret_size. Used only for the landscape layout. */ -public class PageIndicatorLandscape extends PageIndicator { +public class PageIndicatorLandscape extends PageIndicator implements OnClickListener { // all apps pull up handle drawable. public PageIndicatorLandscape(Context context) { @@ -38,8 +44,17 @@ public class PageIndicatorLandscape extends PageIndicator { public PageIndicatorLandscape(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - Launcher l = Launcher.getLauncher(context); - setOnClickListener(l); - setOnFocusChangeListener(l.mFocusHandler); + setOnClickListener(this); + setOnFocusChangeListener(Launcher.getLauncher(context).mFocusHandler); + } + + @Override + public void onClick(View view) { + Launcher l = Launcher.getLauncher(getContext()); + if (!l.isInState(ALL_APPS)) { + l.getUserEventDispatcher().logActionOnControl( + Action.Touch.TAP, ControlType.ALL_APPS_BUTTON); + l.getStateManager().goToState(ALL_APPS); + } } } diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorLine.java b/src/com/android/launcher3/pageindicators/PageIndicatorLine.java index 09a06b0da..6c4b89820 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorLine.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorLine.java @@ -14,7 +14,6 @@ import android.os.Looper; import android.util.AttributeSet; import android.util.Property; import android.view.ViewConfiguration; -import android.widget.ImageView; import com.android.launcher3.Launcher; import com.android.launcher3.R; @@ -54,7 +53,6 @@ public class PageIndicatorLine extends PageIndicator { private Paint mLinePaint; private Launcher mLauncher; private final int mLineHeight; - private ImageView mAllAppsHandle; private static final Property<PageIndicatorLine, Integer> PAINT_ALPHA = new Property<PageIndicatorLine, Integer>(Integer.class, "paint_alpha") { @@ -98,12 +96,7 @@ public class PageIndicatorLine extends PageIndicator { } }; - private Runnable mHideLineRunnable = new Runnable() { - @Override - public void run() { - animateLineToAlpha(0); - } - }; + private Runnable mHideLineRunnable = () -> animateLineToAlpha(0); public PageIndicatorLine(Context context) { this(context, null); @@ -129,20 +122,6 @@ public class PageIndicatorLine extends PageIndicator { } @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mAllAppsHandle = findViewById(R.id.all_apps_handle); - mAllAppsHandle.setOnClickListener(mLauncher); - mAllAppsHandle.setOnFocusChangeListener(mLauncher.mFocusHandler); - mLauncher.setAllAppsButton(mAllAppsHandle); - } - - @Override - public void setAccessibilityDelegate(AccessibilityDelegate delegate) { - mAllAppsHandle.setAccessibilityDelegate(delegate); - } - - @Override protected void onDraw(Canvas canvas) { if (mTotalScroll == 0 || mNumPagesFloat == 0) { return; @@ -159,11 +138,6 @@ public class PageIndicatorLine extends PageIndicator { } @Override - public void setContentDescription(CharSequence contentDescription) { - mAllAppsHandle.setContentDescription(contentDescription); - } - - @Override public void setScroll(int currentScroll, int totalScroll) { if (getAlpha() == 0) { return; |