commit 3104ae360dd96eff4201cb293249779b1abdf343
author Kirill Grouchnikov <kirillg@google.com> Wed Apr 20 11:28:37 2016 -0400
committer Kirill Grouchnikov <kirillg@google.com> Wed Apr 20 11:49:43 2016 -0400
tree fae6921711b795465f8d43dc8e0c9f06cbed6855
parent 8290f54e0739042350bc549c2afc71841534955c

Use ViewCompat.getLayoutDirection in Toolbar.

Otherwise it crashes using v17+ getLayoutDirection from View.

Bug: 28282893
Change-Id: I4eef42828c4ebb2d4c832bf4df9aa3e4dbf6912e

v7/appcompat/src/android/support/v7/widget/Toolbar.java

diff --git a/v7/appcompat/src/android/support/v7/widget/Toolbar.java b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
index f765f27..f0adadc 100644
--- a/v7/appcompat/src/android/support/v7/widget/Toolbar.java
+++ b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
@@ -1327,7 +1327,7 @@
      * @see #getContentInsetEndWithActions()
      */
     public int getCurrentContentInsetLeft() {
-        return getLayoutDirection() == LAYOUT_DIRECTION_RTL
+        return ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL
                 ? getCurrentContentInsetEnd()
                 : getCurrentContentInsetStart();
     }
@@ -1342,7 +1342,7 @@
      * @see #getContentInsetEndWithActions()
      */
     public int getCurrentContentInsetRight() {
-        return getLayoutDirection() == LAYOUT_DIRECTION_RTL
+        return ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL
                 ? getCurrentContentInsetStart()
                 : getCurrentContentInsetEnd();
     }