commit 9716d9a534b0ae1db0162cd3726bbf38863928ab
author Andrew Sapperstein <asapperstein@google.com> Fri Jan 24 17:34:42 2014 -0800
committer Andrew Sapperstein <asapperstein@google.com> Fri Jan 24 17:34:42 2014 -0800
tree 84dac43b525a92d8e25b9d0aefe8ac4e5095f1a3
parent a31a0a2b0177958a968c222567da43038c882650

RTL - fix folder name padding. b/12721062.

Change-Id: I7ed8658ac33a469a3f7076ac9021b855748426ce

src/com/android/mail/ui/FolderItemView.java

diff --git a/src/com/android/mail/ui/FolderItemView.java b/src/com/android/mail/ui/FolderItemView.java
index 6df68d8..d0d99dc 100644
--- a/src/com/android/mail/ui/FolderItemView.java
+++ b/src/com/android/mail/ui/FolderItemView.java
@@ -15,6 +15,7 @@
  */
 package com.android.mail.ui;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
 import android.support.v4.text.BidiFormatter;
@@ -131,13 +132,21 @@
      * Sets the icon, if any. If the image view's visibility is set to gone, the text view will
      * be moved over to account for the change.
      */
+    @SuppressLint("NewApi")
     public void setIcon(final Folder folder) {
         final ImageView folderIconView = (ImageView) findViewById(R.id.folder_icon);
         Folder.setIcon(folder, folderIconView);
         if (folderIconView.getVisibility() == View.GONE) {
-            mFolderTextView.setPadding(getContext()
-                    .getResources().getDimensionPixelSize(R.dimen.folder_list_item_left_offset),
-                    0, 0, 0 /* No top, right, bottom padding needed */);
+            final int paddingStart = getContext().getResources().getDimensionPixelSize(
+                    R.dimen.folder_list_item_left_offset);
+            if (Utils.isRunningJBMR1OrLater()) {
+                // start, top, end, bottom
+                mFolderTextView.setPaddingRelative(paddingStart, mFolderTextView.getPaddingTop(),
+                        mFolderTextView.getPaddingEnd(), mFolderTextView.getPaddingBottom());
+            } else {
+                mFolderTextView.setPadding(paddingStart, mFolderTextView.getPaddingTop(),
+                        mFolderTextView.getPaddingRight(), mFolderTextView.getPaddingBottom());
+            }
         } else {
             // View recycling case
             mFolderTextView.setPadding(0, 0, 0, 0);