diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 22:06:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-20 22:06:35 +0000 |
| commit | 3f849f410808a0bca039d73fd763825c73d15419 (patch) | |
| tree | a9af0794f210bd49a37148dbb2740469ca327ebe /src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java | |
| parent | 786cf97b83a4e502b8683198cdea8872c8507b93 (diff) | |
| parent | ef861375eebd9ac6cce7c0bb163380ab1c951063 (diff) | |
| download | android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.gz android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.bz2 android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: ef861375ee
* commit 'ef861375eebd9ac6cce7c0bb163380ab1c951063':
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java index f7fcec5e..419dbf42 100644 --- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java @@ -20,6 +20,7 @@ import android.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.util.Log; +import com.android.packageinstaller.permission.utils.Utils; import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear; import com.android.packageinstaller.DeviceUtils; @@ -40,7 +41,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity { switch (action) { case Intent.ACTION_MANAGE_PERMISSIONS: { - fragment = ManagePermissionsFragment.newInstance(); + if (Utils.isTelevision(this)) { + fragment = com.android.packageinstaller.permission.ui.television + .ManagePermissionsFragment.newInstance(); + } else { + fragment = com.android.packageinstaller.permission.ui.handheld + .ManagePermissionsFragment.newInstance(); + } } break; case Intent.ACTION_MANAGE_APP_PERMISSIONS: { @@ -50,11 +57,14 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity { finish(); return; } - if (DeviceUtils.isWear(this)) { fragment = AppPermissionsFragmentWear.newInstance(packageName); + } else if (Utils.isTelevision(this)) { + fragment = com.android.packageinstaller.permission.ui.television + .AppPermissionsFragment.newInstance(packageName); } else { - fragment = AppPermissionsFragment.newInstance(packageName); + fragment = com.android.packageinstaller.permission.ui.handheld + .AppPermissionsFragment.newInstance(packageName); } } break; @@ -65,7 +75,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity { finish(); return; } - fragment = PermissionAppsFragment.newInstance(permissionName); + if (Utils.isTelevision(this)) { + fragment = com.android.packageinstaller.permission.ui.television + .PermissionAppsFragment.newInstance(permissionName); + } else { + fragment = com.android.packageinstaller.permission.ui.handheld + .PermissionAppsFragment.newInstance(permissionName); + } } break; default: { |