Add "show additional permissions" screen to app permissions for TV.

This also cleans up some code:
1) Factor out isTelevision into Utils.isTelevision() and call
   it where we were previously inlining that code
2) Make AppPermissionsFragment work better with config changes
   and screen rotation changes (the extra screen wasn't working
   at all with such changes)

b/22045242

Change-Id: I937eaa67f19f44b5e1a76a58e3fdd799ae36e73b

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
index 4135af97..7b58fed1 100644
--- a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
+++ b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
@@ -17,7 +17,6 @@
 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.view.LayoutInflater;
@@ -28,6 +27,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.packageinstaller.R;
+import com.android.packageinstaller.permission.utils.Utils;
 
 public abstract class SettingsWithHeader extends PermissionsFrameFragment
         implements OnClickListener {
@@ -42,8 +42,7 @@ public abstract class SettingsWithHeader extends PermissionsFrameFragment
             Bundle savedInstanceState) {
         ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
 
-        int uiMode = getResources().getConfiguration().uiMode;
-        if ((uiMode & Configuration.UI_MODE_TYPE_MASK) != Configuration.UI_MODE_TYPE_TELEVISION) {
+        if (!Utils.isTelevision(getContext())) {
             mHeader = inflater.inflate(R.layout.header, root, false);
             getPreferencesContainer().addView(mHeader, 0);
             updateHeader();