diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-xlarge/status_bar_recent_panel.xml index 97cbfcaccc5ee..cc044a1be370a 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar_recent_panel.xml @@ -27,15 +27,6 @@ android:id="@+id/recents_bg_protect" android:orientation="vertical"> - - - mActivityDescriptions; @@ -123,7 +126,6 @@ public class RecentAppsPanel extends LinearLayout implements StatusBarPanel, OnC @Override protected void onFinishInflate() { super.onFinishInflate(); - mNoRecents = (TextView) findViewById(R.id.recents_no_recents); mRecentsContainer = (LinearLayout) findViewById(R.id.recents_container); mRecentsGlowView = findViewById(R.id.recents_glow); mBackgroundProtector = (View) findViewById(R.id.recents_bg_protect); @@ -193,7 +195,10 @@ public class RecentAppsPanel extends LinearLayout implements StatusBarPanel, OnC .resolveActivityInfo(pm, 0); int numTasks = recentTasks.size(); - for (int i = 0, index = 0; i < numTasks && (index < MAX_TASKS); ++i) { + + // skip the first activity - assume it's either the home screen or the current app. + final int first = 1; + for (int i = first, index = 0; i < numTasks && (index < MAX_TASKS); ++i) { final ActivityManager.RecentTaskInfo recentInfo = recentTasks.get(i); Intent intent = new Intent(recentInfo.baseIntent); @@ -297,22 +302,21 @@ public class RecentAppsPanel extends LinearLayout implements StatusBarPanel, OnC if (animate) { view.setAlpha(initialAlpha); ObjectAnimator anim = ObjectAnimator.ofFloat(view, "alpha", initialAlpha, 1.0f); - anim.setDuration(200); - anim.setStartDelay((last-i)*80); + anim.setDuration(ALPHA_ANIMATION_DURATION); + anim.setStartDelay((last-i) * STAGGER_ANIMATION_DELAY); anim.setInterpolator(interp); anims.add(anim); } } int views = mRecentsContainer.getChildCount(); - mNoRecents.setVisibility(View.GONE); // views == 0 ? View.VISIBLE : View.GONE); mRecentsContainer.setVisibility(views > 0 ? View.VISIBLE : View.GONE); mRecentsGlowView.setVisibility(views > 0 ? View.VISIBLE : View.GONE); if (animate && views > 0) { ObjectAnimator anim = ObjectAnimator.ofFloat(mRecentsGlowView, "alpha", initialAlpha, 1.0f); - anim.setDuration((last-first)*80); + anim.setDuration((last-first) * STAGGER_ANIMATION_DELAY); anim.setInterpolator(interp); anims.add(anim); } @@ -320,7 +324,7 @@ public class RecentAppsPanel extends LinearLayout implements StatusBarPanel, OnC if (animate) { ObjectAnimator anim = ObjectAnimator.ofFloat(mBackgroundProtector, "alpha", initialAlpha, 1.0f); - anim.setDuration(last*80); + anim.setDuration(last * STAGGER_ANIMATION_DELAY); anim.setInterpolator(interp); anims.add(anim); }