Merge "Fixing orientation change bug (5098088)" (6f983a79) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,10 +36,10 @@
		<string name="status_bar_please_disturb_button">Show notifications</string>

		<!-- Title shown in recents popup for removing an application from the list -->
		<string name="status_bar_recent_remove_item_title">Remove</string>
		<string name="status_bar_recent_remove_item_title">Remove from list</string>

		<!-- Title shown in recents popup for inspecting an application's properties -->
		<string name="status_bar_recent_inspect_item_title">Inspect</string>
		<string name="status_bar_recent_inspect_item_title">App info</string>

		<!-- The label in the bar at the top of the status bar when there are no notifications
		showing. [CHAR LIMIT=40]-->

+10 −9

Original line number	Diff line number	Diff line
		@@ -243,6 +243,16 @@ public class RecentsPanelView extends RelativeLayout
		}
		}

		public void hide(boolean animate) {
		mShowing = false;
		if (!animate) {
		setVisibility(View.GONE);
		}
		if (mBar != null) {
		mBar.animateCollapse();
		}
		}

		public void handleShowBackground(boolean show) {
		if (show) {
		mRecentsScrim.setBackgroundResource(R.drawable.status_bar_recents_background);
		@@ -654,15 +664,6 @@ public class RecentsPanelView extends RelativeLayout
		mRecentsGlowView.setVisibility(items > 0 ? View.VISIBLE : View.GONE);
		}

		public void hide(boolean animate) {
		if (!animate) {
		setVisibility(View.GONE);
		}
		if (mBar != null) {
		mBar.animateCollapse();
		}
		}

		public void handleOnClick(View view) {
		ActivityDescription ad = ((ViewHolder) view.getTag()).activityDescription;
		final Context context = view.getContext();

+1 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ public class PhoneStatusBar extends StatusBar {
		// Recents Panel
		boolean visible = false;
		if (mRecentsPanel != null) {
		visible = mRecentsPanel.getVisibility() == View.VISIBLE;
		visible = mRecentsPanel.isShowing();
		WindowManagerImpl.getDefault().removeView(mRecentsPanel);
		}