diff options
author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2014-11-10 10:35:00 -0800 |
---|---|---|
committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:56 -0800 |
commit | 3ada0966559cd9fee535a40686e049cd0d6f15c0 (patch) | |
tree | 0b06557595d3c49e1ff826ffa2053824c3dc2031 /src/com/android/launcher3/Launcher.java | |
parent | 0daed36da7dab3172f05aa3dc29b7facac01ce6e (diff) | |
download | packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.gz packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.tar.bz2 packages_apps_Trebuchet-3ada0966559cd9fee535a40686e049cd0d6f15c0.zip |
PagedView: Transition Effects
Conflicts:
res/layout/overview_panel.xml
res/values/cm_arrays.xml
res/values/cm_strings.xml
res/values/dimens.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/AppsCustomizePagedView.java
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/PagedView.java
src/com/android/launcher3/Workspace.java
src/com/android/launcher3/settings/SettingsProvider.java
Change-Id: Ib134705952877165c334181548d577b3dceece68
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d04c42348..dcc87b83a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1,4 +1,3 @@ - /* * Copyright (C) 2008 The Android Open Source Project * @@ -32,6 +31,7 @@ import android.app.AlertDialog; import android.app.Fragment; import android.app.FragmentManager; import android.app.FragmentTransaction; +import android.app.Dialog; import android.app.SearchManager; import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetManager; @@ -42,6 +42,7 @@ import android.content.ComponentCallbacks2; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; @@ -82,6 +83,7 @@ import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuItem; import android.view.MotionEvent; import android.view.Surface; import android.view.View; @@ -100,6 +102,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.Advanceable; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; @@ -314,6 +317,8 @@ public class Launcher extends Activity private Bundle mSavedInstanceState; + private Dialog mTransitionEffectDialog; + private LauncherModel mModel; private IconCache mIconCache; private boolean mUserPresent = true; @@ -371,6 +376,9 @@ public class Launcher extends Activity private BubbleTextView mWaitingForResume; + // Preferences + private boolean mHideIconLabels; + private Runnable mBuildLayersRunnable = new Runnable() { public void run() { if (mWorkspace != null) { @@ -397,10 +405,6 @@ public class Launcher extends Activity FocusIndicatorView mFocusHandler; - static boolean isPropertyEnabled(String propertyName) { - return Log.isLoggable(propertyName, Log.VERBOSE); - } - public Animator.AnimatorListener mAnimatorListener = new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator arg0) {} @@ -414,7 +418,7 @@ public class Launcher extends Activity public void onAnimationCancel(Animator arg0) {} }; - private static boolean isPropertyEnabled(String propertyName) { + public static boolean isPropertyEnabled(String propertyName) { return Log.isLoggable(propertyName, Log.VERBOSE); } @@ -544,11 +548,6 @@ public class Launcher extends Activity mIconCache.flushInvalidIcons(mGrid); } - protected void onUserLeaveHint() { - super.onUserLeaveHint(); - sPausedFromUserAction = true; - } - /** To be overriden by subclasses to hint to Launcher that we have custom content */ protected boolean hasCustomContentToLeft() { return false; @@ -1486,7 +1485,7 @@ public class Launcher extends Activity mHotseat.setOnLongClickListener(this); } - mOverviewPanel = findViewById(R.id.overview_panel); + mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel); mOverviewSettingsPanel = new OverviewSettingsPanel( this, mOverviewPanel); mOverviewSettingsPanel.initializeAdapter(); @@ -2027,6 +2026,10 @@ public class Launcher extends Activity // also will cancel mWaitingForResult. closeSystemDialogs(); + if (mTransitionEffectDialog != null) { + mTransitionEffectDialog.cancel(); + } + final boolean alreadyOnHome = mHasFocus && ((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); @@ -3247,18 +3250,10 @@ public class Launcher extends Activity return mHotseat != null && layout != null && (layout instanceof CellLayout) && (layout == mHotseat.getLayout()); } - Hotseat getHotseat() { - return mHotseat; - } - View getOverviewPanel() { - return mOverviewPanel; - } + View getDarkPanel() { return mDarkPanel; } - SearchDropTargetBar getSearchBar() { - return mSearchDropTargetBar; - } /** * Returns the CellLayout of the specified container at the specified screen. @@ -3275,10 +3270,6 @@ public class Launcher extends Activity } } - protected Workspace getWorkspace() { - return mWorkspace; - } - protected AppsCustomizePagedView getAppsCustomizeContent() { return mAppsCustomizeContent; } |