diff --git a/res/drawable-hdpi/cling_bg.9.png b/res/drawable-hdpi/cling_bg.9.png
deleted file mode 100644
index fb101f4d4a..0000000000
Binary files a/res/drawable-hdpi/cling_bg.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/cling_bg.9.png b/res/drawable-mdpi/cling_bg.9.png
deleted file mode 100644
index 6384f29cb2..0000000000
Binary files a/res/drawable-mdpi/cling_bg.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/cling_bg.9.png b/res/drawable-xhdpi/cling_bg.9.png
deleted file mode 100644
index 7d8b1f0d3a..0000000000
Binary files a/res/drawable-xhdpi/cling_bg.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/cling_bg.9.png b/res/drawable-xxhdpi/cling_bg.9.png
deleted file mode 100644
index d31ea70926..0000000000
Binary files a/res/drawable-xxhdpi/cling_bg.9.png and /dev/null differ
diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml
deleted file mode 100644
index 9672dd8a05..0000000000
--- a/res/layout-land/longpress_cling.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout-port/longpress_cling.xml b/res/layout-port/longpress_cling.xml
deleted file mode 100644
index c0b526713a..0000000000
--- a/res/layout-port/longpress_cling.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout-sw600dp-port/longpress_cling.xml b/res/layout-sw600dp-port/longpress_cling.xml
deleted file mode 100644
index c4573d5354..0000000000
--- a/res/layout-sw600dp-port/longpress_cling.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/longpress_cling_content.xml b/res/layout/longpress_cling_content.xml
deleted file mode 100644
index 47a8e97976..0000000000
--- a/res/layout/longpress_cling_content.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/longpress_cling_welcome_content.xml b/res/layout/longpress_cling_welcome_content.xml
deleted file mode 100644
index dd4f8d7679..0000000000
--- a/res/layout/longpress_cling_welcome_content.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index e5f2d829bf..85a436cf92 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -26,14 +26,6 @@
525dp
36dp
-
- 400dp
- 274dp
- 600dp
- -300dp
- 64dp
- 280dp
-
56dp
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 789f4533cc..c2d20a3101 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -22,8 +22,4 @@
64dp
180dp
-
- 96dp
- 320dp
-
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1af449c031..d411a4f47a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,7 +22,6 @@
over the delete target or the info target -->
#FFC1C1C1
#FFF0592B
- #80000000
#80c6c5c5
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 11760f4e17..65baf461e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -121,24 +121,6 @@
New home screen page
-
-
- Welcome
-
- Copy your app icons
-
- Import icons and folders from your old Home screens?
-
- COPY ICONS
-
- START FRESH
-
- Wallpapers, widgets, & settings
-
- Touch & hold background to customize
-
- GOT IT
-
Folder opened, %1$d by %2$d
diff --git a/src/com/android/launcher3/BorderCropDrawable.java b/src/com/android/launcher3/BorderCropDrawable.java
deleted file mode 100644
index caf497d9b5..0000000000
--- a/src/com/android/launcher3/BorderCropDrawable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014 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.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-public class BorderCropDrawable extends Drawable {
-
- private final Drawable mChild;
- private final Rect mBoundsShift;
- private final Rect mPadding;
-
- BorderCropDrawable(Drawable child, boolean cropLeft,
- boolean cropTop, boolean cropRight, boolean cropBottom) {
- mChild = child;
-
- mBoundsShift = new Rect();
- mPadding = new Rect();
- mChild.getPadding(mPadding);
-
- if (cropLeft) {
- mBoundsShift.left = -mPadding.left;
- mPadding.left = 0;
- }
- if (cropTop) {
- mBoundsShift.top = -mPadding.top;
- mPadding.top = 0;
- }
- if (cropRight) {
- mBoundsShift.right = mPadding.right;
- mPadding.right = 0;
- }
- if (cropBottom) {
- mBoundsShift.bottom = mPadding.bottom;
- mPadding.bottom = 0;
- }
- }
-
- @Override
- protected void onBoundsChange(Rect bounds) {
- mChild.setBounds(
- bounds.left + mBoundsShift.left,
- bounds.top + mBoundsShift.top,
- bounds.right + mBoundsShift.right,
- bounds.bottom + mBoundsShift.bottom);
- }
-
- @Override
- public boolean getPadding(Rect padding) {
- padding.set(mPadding);
- return (padding.left | padding.top | padding.right | padding.bottom) != 0;
- }
-
- @Override
- public void draw(Canvas canvas) {
- mChild.draw(canvas);
- }
-
- @Override
- public int getOpacity() {
- return mChild.getOpacity();
- }
-
- @Override
- public void setAlpha(int alpha) {
- mChild.setAlpha(alpha);
- }
-
- @Override
- public void setColorFilter(ColorFilter cf) {
- mChild.setColorFilter(cf);
- }
-}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2ecf176541..556246fe5e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -293,8 +293,6 @@ public class Launcher extends Activity
/** Maps launcher activity components to their list of shortcut ids. */
private MultiHashMap mDeepShortcutMap = new MultiHashMap<>();
- private LauncherClings mClings;
-
private View.OnTouchListener mHapticFeedbackTouchListener;
// Related to the auto-advancing of widgets
@@ -3364,18 +3362,6 @@ public class Launcher extends Activity
return anim;
}
- public void onLauncherClingShown() {
- // When a launcher cling appears, it should cover the underlying layers, so their focus
- // should be blocked.
- if (mDragLayer.getDescendantFocusability() != ViewGroup.FOCUS_BLOCK_DESCENDANTS) {
- mDragLayer.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
- }
- }
-
- public void onLauncherClingDismissed() {
- mDragLayer.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
- }
-
public void enterSpringLoadedDragMode() {
if (LOGD) Log.d(TAG, String.format("enterSpringLoadedDragMode [mState=%s", mState.name()));
if (isStateSpringLoaded()) {
@@ -3996,8 +3982,7 @@ public class Launcher extends Activity
private boolean canRunNewAppsAnimation() {
long diff = System.currentTimeMillis() - mDragController.getLastGestureUpTime();
- return diff > (NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS * 1000)
- && (mClings == null || !mClings.isVisible());
+ return diff > (NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS * 1000);
}
private ValueAnimator createNewAppBounceAnimation(View v, int i) {
@@ -4371,42 +4356,6 @@ public class Launcher extends Activity
}
}
- public void dismissIntroScreen() {
- markIntroScreenDismissed();
- if (showFirstRunActivity()) {
- // We delay hiding the intro view until the first run activity is showing. This
- // avoids a blip.
- mWorkspace.postDelayed(new Runnable() {
- @Override
- public void run() {
- mDragLayer.dismissOverlayView();
- showFirstRunClings();
- }
- }, ACTIVITY_START_DELAY);
- } else {
- mDragLayer.dismissOverlayView();
- showFirstRunClings();
- }
- changeWallpaperVisiblity(true);
- }
-
- private void markIntroScreenDismissed() {
- SharedPreferences.Editor editor = mSharedPrefs.edit();
- editor.putBoolean(INTRO_SCREEN_DISMISSED, true);
- editor.apply();
- }
-
- @Thunk void showFirstRunClings() {
- // The two first run cling paths are mutually exclusive, if the launcher is preinstalled
- // on the device, then we always show the first run cling experience (or if there is no
- // launcher2). Otherwise, we prompt the user upon started for migration
- LauncherClings launcherClings = new LauncherClings(this);
- if (launcherClings.shouldShowFirstRunOrMigrationClings()) {
- mClings = launcherClings;
- launcherClings.showLongPressCling(true);
- }
- }
-
// TODO: These method should be a part of LauncherSearchCallback
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public ItemInfo createAppDragInfo(Intent appLaunchIntent) {
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index f0e95938a8..c1282b51c1 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -16,192 +16,12 @@
package com.android.launcher3;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.annotation.TargetApi;
-import android.app.ActivityManager;
import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
-import android.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.accessibility.AccessibilityManager;
-import com.android.launcher3.util.Thunk;
-
-public class LauncherClings implements OnClickListener, OnKeyListener {
+@Deprecated
+public class LauncherClings {
private static final String WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.workspace.dismissed";
- private static final String TAG_CROP_TOP_AND_SIDES = "crop_bg_top_and_sides";
-
- private static final int SHOW_CLING_DURATION = 250;
- private static final int DISMISS_CLING_DURATION = 200;
-
- @Thunk Launcher mLauncher;
- private LayoutInflater mInflater;
- @Thunk boolean mIsVisible;
-
- /** Ctor */
- public LauncherClings(Launcher launcher) {
- mLauncher = launcher;
- mInflater = LayoutInflater.from(mLauncher);
- }
-
- @Override
- public void onClick(View v) {
- if (v.getId() == R.id.cling_dismiss_longpress_info) {
- dismissLongPressCling();
- }
- }
-
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- if (event.isPrintingKey()) {
- // Should ignore all printing keys, otherwise they come to the search box.
- return true;
- }
- if (keyCode == KeyEvent.KEYCODE_MENU) {
- // Menu key goes to the overview mode similar to longpress, therefore it needs to
- // dismiss the clings.
- dismissLongPressCling();
- }
- return false;
- }
-
- public void showLongPressCling(boolean showWelcome) {
- mIsVisible = true;
- ViewGroup root = (ViewGroup) mLauncher.findViewById(R.id.launcher);
- View cling = mInflater.inflate(R.layout.longpress_cling, root, false);
-
- cling.setOnLongClickListener(new OnLongClickListener() {
-
- @Override
- public boolean onLongClick(View v) {
- mLauncher.showOverviewMode(true);
- dismissLongPressCling();
- return true;
- }
- });
-
- final ViewGroup content = (ViewGroup) cling.findViewById(R.id.cling_content);
- mInflater.inflate(showWelcome ? R.layout.longpress_cling_welcome_content
- : R.layout.longpress_cling_content, content);
- final View button = content.findViewById(R.id.cling_dismiss_longpress_info);
- button.setOnClickListener(this);
- button.setOnKeyListener(this);
-
- if (TAG_CROP_TOP_AND_SIDES.equals(content.getTag())) {
- Drawable bg = new BorderCropDrawable(mLauncher.getResources().getDrawable(R.drawable.cling_bg),
- true, true, true, false);
- content.setBackground(bg);
- }
-
- mLauncher.onLauncherClingShown();
- root.addView(cling);
-
- if (showWelcome) {
- // This is the first cling being shown. No need to animate.
- return;
- }
-
- // Animate
- content.getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-
- @Override
- public void onGlobalLayout() {
- content.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
- ObjectAnimator anim;
- if (TAG_CROP_TOP_AND_SIDES.equals(content.getTag())) {
- content.setTranslationY(-content.getMeasuredHeight());
- anim = LauncherAnimUtils.ofFloat(content, View.TRANSLATION_Y, 0);
- } else {
- content.setScaleX(0);
- content.setScaleY(0);
- PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat(View.SCALE_X, 1);
- PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 1);
- anim = LauncherAnimUtils.ofPropertyValuesHolder(content, scaleX, scaleY);
- }
-
- anim.setDuration(SHOW_CLING_DURATION);
- anim.setInterpolator(new LogDecelerateInterpolator(100, 0));
- anim.start();
- }
- });
- }
-
- @Thunk void dismissLongPressCling() {
- Runnable dismissCb = new Runnable() {
- public void run() {
- final View cling = mLauncher.findViewById(R.id.longpress_cling);
- // To catch cases where siblings of top-level views are made invisible, just check whether
- // the cling is directly set to GONE before dismissing it.
- if (cling != null && cling.getVisibility() != View.GONE) {
- final Runnable cleanUpClingCb = new Runnable() {
- public void run() {
- cling.setVisibility(View.GONE);
- mLauncher.getSharedPrefs().edit()
- .putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true)
- .apply();
- mIsVisible = false;
- mLauncher.onLauncherClingDismissed();
- }
- };
- cling.animate().alpha(0).setDuration(DISMISS_CLING_DURATION)
- .withEndAction(cleanUpClingCb);
- }
- }
- };
- mLauncher.getWorkspace().post(dismissCb);
- }
-
- public boolean isVisible() {
- return mIsVisible;
- }
-
- /** Returns whether the clings are enabled or should be shown */
- @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
- private boolean areClingsEnabled() {
- // disable clings when running in a test harness
- if(ActivityManager.isRunningInTestHarness()) return false;
-
- // Disable clings for accessibility when explore by touch is enabled
- final AccessibilityManager a11yManager = (AccessibilityManager) mLauncher.getSystemService(
- Launcher.ACCESSIBILITY_SERVICE);
- if (a11yManager.isTouchExplorationEnabled()) {
- return false;
- }
-
- // Restricted secondary users (child mode) will potentially have very few apps
- // seeded when they start up for the first time. Clings won't work well with that
- if (Utilities.ATLEAST_JB_MR2) {
- UserManager um = (UserManager) mLauncher.getSystemService(Context.USER_SERVICE);
- Bundle restrictions = um.getUserRestrictions();
- if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) {
- return false;
- }
- }
- if (Settings.Secure.getInt(mLauncher.getContentResolver(),
- Settings.Secure.SKIP_FIRST_USE_HINTS, 0) == 1) {
- return false;
- }
- return true;
- }
-
- public boolean shouldShowFirstRunOrMigrationClings() {
- return areClingsEnabled() &&
- !mLauncher.getSharedPrefs().getBoolean(WORKSPACE_CLING_DISMISSED_KEY, false);
- }
-
public static void markFirstRunClingDismissed(Context ctx) {
Utilities.getPrefs(ctx).edit()
.putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true)