Merge remote branch 'cm/cm-10.1' into cm-10.1

CyanogenMod · Jan 4, 2013 · c052ef8 · c052ef8
2 parents 7c2a1f3 + ea70b09
commit c052ef8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -89,10 +89,11 @@ protected void onFinishInflate() {
         mRemoveActiveDrawable = r.getDrawable(R.drawable.ic_launcher_clear_active_holo);
         mRemoveNormalDrawable = r.getDrawable(R.drawable.ic_launcher_clear_normal_holo);
 
-        // Remove the text in the Phone UI in landscape
+        // Remove the text in landscape
         int orientation = getResources().getConfiguration().orientation;
+        boolean transposeLayout = getResources().getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            if (!LauncherApplication.isScreenLarge()) {
+            if (transposeLayout) {
                 setText("");
             }
         }

diff --git a/src/com/cyanogenmod/trebuchet/EditDropTarget.java b/src/com/cyanogenmod/trebuchet/EditDropTarget.java
@@ -53,10 +53,11 @@ protected void onFinishInflate() {
         mDrawable = (TransitionDrawable) getCurrentDrawable();
         mDrawable.setCrossFadeEnabled(true);
 
-        // Remove the text in the Phone UI in landscape
+        // Remove the text in landscape
         int orientation = getResources().getConfiguration().orientation;
+        boolean transposeLayout = getResources().getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            if (!LauncherApplication.isScreenLarge()) {
+            if (transposeLayout) {
                 setText("");
             }
         }

diff --git a/src/com/cyanogenmod/trebuchet/InfoDropTarget.java b/src/com/cyanogenmod/trebuchet/InfoDropTarget.java
@@ -51,10 +51,11 @@ protected void onFinishInflate() {
         mDrawable = (TransitionDrawable) getCurrentDrawable();
         mDrawable.setCrossFadeEnabled(true);
 
-        // Remove the text in the Phone UI in landscape
+        // Remove the text in landscape
         int orientation = getResources().getConfiguration().orientation;
+        boolean transposeLayout = getResources().getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            if (!LauncherApplication.isScreenLarge()) {
+            if (transposeLayout) {
                 setText("");
             }
         }