diff options
author | Todd Volkert <tvolkert@google.com> | 2015-07-14 11:19:48 -0700 |
---|---|---|
committer | Todd Volkert <tvolkert@google.com> | 2015-07-14 12:20:32 -0700 |
commit | f5f6b1b113bb39a268948c19a39833d3ff839d32 (patch) | |
tree | 0fab132103c53399e24642fce5e242c8631e663c /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
parent | b9b20815315d35ed2d10edcbbae4913da36f4107 (diff) | |
download | android_packages_apps_PackageInstaller-f5f6b1b113bb39a268948c19a39833d3ff839d32.tar.gz android_packages_apps_PackageInstaller-f5f6b1b113bb39a268948c19a39833d3ff839d32.tar.bz2 android_packages_apps_PackageInstaller-f5f6b1b113bb39a268948c19a39833d3ff839d32.zip |
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
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 4a733160..cc96bec9 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -18,8 +18,6 @@ package com.android.packageinstaller.permission.ui; import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.content.res.Configuration.UI_MODE_TYPE_MASK; -import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION; import android.app.Activity; import android.app.admin.DevicePolicyManager; @@ -36,7 +34,6 @@ import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.util.ArrayMap; import android.util.Log; -import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; import android.view.Window; @@ -47,6 +44,7 @@ import com.android.packageinstaller.permission.model.AppPermissionGroup; import com.android.packageinstaller.permission.model.AppPermissions; import com.android.packageinstaller.permission.model.Permission; import com.android.packageinstaller.permission.utils.SafetyNetLogger; +import com.android.packageinstaller.permission.utils.Utils; import java.util.ArrayList; import java.util.List; @@ -73,8 +71,7 @@ public class GrantPermissionsActivity extends Activity setTitle(R.string.permission_request_title); - int uiMode = getResources().getConfiguration().uiMode & UI_MODE_TYPE_MASK; - if (uiMode == UI_MODE_TYPE_TELEVISION) { + if (Utils.isTelevision(this)) { mViewHandler = new GrantPermissionsTvViewHandler(this).setResultListener(this); } else { mViewHandler = new GrantPermissionsDefaultViewHandler(this).setResultListener(this); |