summaryrefslogtreecommitdiffstats
path: root/src/com/android/packageinstaller/permission/ui/handheld
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-11-21 01:30:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-21 01:30:34 +0000
commitcb3c52a427e2ad0d64ec22b134e14cb4c40a70d8 (patch)
tree955add93b6556b0ce4e43c206761687f0062125e /src/com/android/packageinstaller/permission/ui/handheld
parentb24a3fccba27aa02d5b0ce4fd2fabe2c407bf445 (diff)
parent2a6f5d0fc6b3fc65120ba7ed13f81af2d59eb11f (diff)
downloadandroid_packages_apps_PackageInstaller-cb3c52a427e2ad0d64ec22b134e14cb4c40a70d8.tar.gz
android_packages_apps_PackageInstaller-cb3c52a427e2ad0d64ec22b134e14cb4c40a70d8.tar.bz2
android_packages_apps_PackageInstaller-cb3c52a427e2ad0d64ec22b134e14cb4c40a70d8.zip
Fix build am: 0937012335
am: 2a6f5d0fc6 * commit '2a6f5d0fc6b3fc65120ba7ed13f81af2d59eb11f': Fix build
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/handheld')
-rw-r--r--src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java3
-rw-r--r--src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
index 554830a7..eee2f716 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
@@ -37,6 +37,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import com.android.packageinstaller.DeviceUtils;
import com.android.packageinstaller.R;
import com.android.packageinstaller.permission.model.AppPermissionGroup;
import com.android.packageinstaller.permission.model.PermissionApps;
@@ -179,7 +180,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
return;
}
- boolean isTelevision = Utils.isTelevision(context);
+ boolean isTelevision = DeviceUtils.isTelevision(context);
PreferenceScreen screen = getPreferenceScreen();
if (screen == null) {
screen = getPreferenceManager().createPreferenceScreen(getActivity());
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java b/src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java
index acb3c61e..c15a4287 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java
@@ -26,6 +26,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import com.android.packageinstaller.DeviceUtils;
import com.android.packageinstaller.R;
import com.android.packageinstaller.permission.utils.Utils;
@@ -42,7 +43,7 @@ public abstract class SettingsWithHeader extends PermissionsFrameFragment
Bundle savedInstanceState) {
ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
- if (!Utils.isTelevision(getContext())) {
+ if (!DeviceUtils.isTelevision(getContext())) {
mHeader = inflater.inflate(R.layout.header, root, false);
getPreferencesContainer().addView(mHeader, 0);
updateHeader();