Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eaa738ef: am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb

Browse Source 
* commit 'eaa738efac8cb34d57ca6c0aea4c95586b0d9fd4':
  Fix 3354590: Add back button to dismiss RecentAppsPanel
This commit is contained in:
Jim Miller
2011-01-26 19:06:30 -08:00
committed by Android Git Automerger
parent 39530e77e5 eaa738efac
commit 3c70c3bad1
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/res/layout-xlarge/status_bar_recent_panel.xml
View File

@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:paddingBottom="48dip"
android:paddingBottom="@*android:dimen/status_bar_height"
android:clipToPadding="false">
<LinearLayout android:id="@+id/recents_glow"
@@ -52,4 +52,20 @@
</FrameLayout>
<!-- The outer FrameLayout is just used as an opaque background for the dismiss icon -->
<FrameLayout
android:layout_width="80px"
android:layout_height="@*android:dimen/status_bar_height"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ff000000">
<View android:id="@+id/recents_dismiss_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ic_sysbar_back_ime"
/>
</FrameLayout>
</com.android.systemui.statusbar.tablet.RecentAppsPanel>

22
packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java
View File

@@ -70,6 +70,7 @@ public class RecentAppsPanel extends RelativeLayout implements StatusBarPanel, O
private Bitmap mGlowBitmap;
private boolean mShowing;
private Choreographer mChoreo;
private View mRecentsDismissButton;
static class ActivityDescription {
int id;
@@ -272,6 +273,12 @@ public class RecentAppsPanel extends RelativeLayout implements StatusBarPanel, O
mRecentsGlowView = findViewById(R.id.recents_glow);
mRecentsScrim = (View) findViewById(R.id.recents_bg_protect);
mChoreo = new Choreographer(this, mRecentsScrim, mRecentsGlowView);
mRecentsDismissButton = findViewById(R.id.recents_dismiss_button);
mRecentsDismissButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
hide(true);
}
});
// In order to save space, we make the background texture repeat in the Y direction
if (mRecentsScrim != null && mRecentsScrim.getBackground() instanceof BitmapDrawable) {
@@ -399,8 +406,7 @@ public class RecentAppsPanel extends RelativeLayout implements StatusBarPanel, O
} else {
// Immediately hide this panel
mShowing = false;
setVisibility(View.GONE);
// mBar.animateCollapse();
hide(false);
}
}
@@ -445,8 +451,8 @@ public class RecentAppsPanel extends RelativeLayout implements StatusBarPanel, O
appIcon.setImageDrawable(activityDescription.icon);
appLabel.setText(activityDescription.label);
appDesc.setText(activityDescription.description);
view.setOnClickListener(this);
view.setTag(activityDescription);
appThumbnail.setOnClickListener(this);
appThumbnail.setTag(activityDescription);
mRecentsContainer.addView(view);
}
@@ -469,7 +475,13 @@ public class RecentAppsPanel extends RelativeLayout implements StatusBarPanel, O
if (DEBUG) Log.v(TAG, "Starting activity " + intent);
getContext().startActivity(intent);
}
hide(true);
}
private void hide(boolean animate) {
setVisibility(View.GONE);
mBar.animateCollapse();
if (animate) {
mBar.animateCollapse();
}
}
}