Merge "Fix Recents in RTL/landscape mode" into jb-mr2-dev (4aab3c8a) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout-land/status_bar_recent_panel.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,12 +40,13 @@
		android:layout_height="match_parent"
		android:fadingEdge="horizontal"
		android:scrollbars="none"
		android:layout_gravity="end"
		android:layout_gravity="right"
		android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length">

		<LinearLayout android:id="@+id/recents_linear_layout"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layoutDirection="ltr"
		android:layout_gravity="left"
		android:orientation="horizontal">
		</LinearLayout>

+5 −4

Original line number	Diff line number	Diff line
		@@ -559,6 +559,11 @@ public abstract class BaseStatusBar extends SystemUI implements
		+ thumbBgPadding + thumbLeftMargin);
		y = (int) (dm.heightPixels
		- res.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_height) - thumbBgPadding);
		if (mLayoutDirection == View.LAYOUT_DIRECTION_RTL) {
		x = dm.widthPixels - x - res
		.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_width);
		}

		} else { // if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
		float thumbTopMargin = res
		.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_top_margin);
		@@ -596,10 +601,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		y = (int) ((dm.heightPixels - statusBarHeight - height) / 2f + thumbTopMargin
		+ recentsItemTopPadding + thumbBgPadding + statusBarHeight);
		}
		if (mLayoutDirection == View.LAYOUT_DIRECTION_RTL) {
		x = dm.widthPixels - x - res
		.getDimensionPixelSize(R.dimen.status_bar_recents_thumbnail_width);
		}

		ActivityOptions opts = ActivityOptions.makeThumbnailScaleDownAnimation(
		getStatusBarView(),