Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/com/android/internal/view/ActionBarPolicy.java b/core/java/com/android/internal/view/ActionBarPolicy.java
index 0c6b7800f45c..cf69a9d35dfa 100644
--- a/core/java/com/android/internal/view/ActionBarPolicy.java
+++ b/core/java/com/android/internal/view/ActionBarPolicy.java
@@ -19,6 +19,7 @@ package com.android.internal.view;
 import com.android.internal.R;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Build;
@@ -44,7 +45,10 @@ public class ActionBarPolicy {
     }
 
     public boolean showsOverflowMenuButton() {
-        return !ViewConfiguration.get(mContext).hasPermanentMenuKey();
+        return !ViewConfiguration.get(mContext).hasPermanentMenuKey() ||
+                ((mContext.getResources().getConfiguration().uiMode &
+                        Configuration.UI_MODE_TYPE_TELEVISION) ==
+                        Configuration.UI_MODE_TYPE_TELEVISION);
     }
 
     public int getEmbeddedMenuWidthLimit() {