From c80f95228560e5912e97886ed637f4d538e87c70 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Sat, 19 Jul 2014 13:05:26 -0700
Subject: [PATCH] Fix Toolbar title layout in RTL mode

Welp, that one was embarrassing.

Bug 16192193

Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
---
 core/java/android/widget/Toolbar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java
index c0d8764af22e9..d403bf5be59ba 100644
--- a/core/java/android/widget/Toolbar.java
+++ b/core/java/android/widget/Toolbar.java
@@ -1344,7 +1344,7 @@ public class Toolbar extends ViewGroup {
                     subtitleRight = subtitleRight - mTitleMarginEnd;
                     titleTop = subtitleBottom + lp.bottomMargin;
                 }
-                right = Math.max(titleRight, subtitleRight);
+                right = Math.min(titleRight, subtitleRight);
             } else {
                 final int ld = mTitleMarginStart - collapsingMargins[0];
                 left += Math.max(0, ld);