Merge "Only show the header on non-television ui modes." into mnc-dev

1 files changed, 7 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
index d9def799..74146fe6 100644
--- a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
+++ b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
@@ -17,6 +17,7 @@
 package com.android.packageinstaller.permission.ui;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
@@ -42,9 +43,12 @@ public abstract class SettingsWithHeader extends PreferenceFragment implements O
             Bundle savedInstanceState) {
         LinearLayout contentParent =
                 (LinearLayout) super.onCreateView(inflater, container, savedInstanceState);
-        mHeader = inflater.inflate(R.layout.header, contentParent, false);
-        contentParent.addView(mHeader, 0);
-        updateHeader();
+        int uiMode = getResources().getConfiguration().uiMode;
+        if ((uiMode & Configuration.UI_MODE_TYPE_MASK) != Configuration.UI_MODE_TYPE_TELEVISION) {
+            mHeader = inflater.inflate(R.layout.header, contentParent, false);
+            contentParent.addView(mHeader, 0);
+            updateHeader();
+        }
 
         return contentParent;
     }