diff options
author | Todd Volkert <tvolkert@google.com> | 2015-06-23 17:13:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 17:13:30 +0000 |
commit | 6304bd3489621f5433a905a45c2097ef95055b71 (patch) | |
tree | 1265255446ab57900c862bffd32e617d26994a59 /src/com/android/packageinstaller/permission/ui | |
parent | 8b664cac08be458258a6e2d2bbaca74fdb2f44d2 (diff) | |
parent | 56f6509a042464af8586d8c6c28b6f60f60db402 (diff) | |
download | android_packages_apps_PackageInstaller-6304bd3489621f5433a905a45c2097ef95055b71.tar.gz android_packages_apps_PackageInstaller-6304bd3489621f5433a905a45c2097ef95055b71.tar.bz2 android_packages_apps_PackageInstaller-6304bd3489621f5433a905a45c2097ef95055b71.zip |
Merge "Only show the header on non-television ui modes." into mnc-dev
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java | 10 |
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; } |