Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09370123 authored by Svetoslav's avatar Svetoslav
Browse files

Fix build 

Change-Id: I2a3e235bb13f1920c14f6776ee3a1ef7285ea548
parent f4aa668c

src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java

+3 −7
Original line number Diff line number Diff line
@@ -20,13 +20,9 @@ import android.app.Fragment; 
import android.content.Intent;

import android.os.Bundle;

import android.util.Log;

import com.android.packageinstaller.permission.utils.Utils;

<<<<<<< HEAD



import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;

import com.android.packageinstaller.DeviceUtils;

=======

>>>>>>> c10abb25f3864e56b2a24ef3661511cd78921225



public final class ManagePermissionsActivity extends OverlayTouchActivity {

    private static final String LOG_TAG = "ManagePermissionsActivity";
@@ -44,7 +40,7 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity { 


        switch (action) {

            case Intent.ACTION_MANAGE_PERMISSIONS: {

                if (Utils.isTelevision(this)) {

                if (DeviceUtils.isTelevision(this)) {

                    fragment = com.android.packageinstaller.permission.ui.television

                            .ManagePermissionsFragment.newInstance();

                } else {
@@ -62,7 +58,7 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity { 
                }

                if (DeviceUtils.isWear(this)) {

                    fragment = AppPermissionsFragmentWear.newInstance(packageName);

                } else if (Utils.isTelevision(this)) {

                } else if (DeviceUtils.isTelevision(this)) {

                    fragment = com.android.packageinstaller.permission.ui.television

                            .AppPermissionsFragment.newInstance(packageName);

                } else {
@@ -78,7 +74,7 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity { 
                    finish();

                    return;

                }

                if (Utils.isTelevision(this)) {

                if (DeviceUtils.isTelevision(this)) {

                    fragment = com.android.packageinstaller.permission.ui.television

                            .PermissionAppsFragment.newInstance(permissionName);

                } else {

src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -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());

src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.animation.Animation.AnimationListener; 
import android.view.animation.AnimationUtils;

import android.widget.TextView;



import com.android.packageinstaller.DeviceUtils;

import com.android.packageinstaller.R;

import com.android.packageinstaller.permission.utils.Utils;
@@ -133,7 +134,7 @@ public abstract class PermissionsFrameFragment extends PreferenceFragment { 
    @Override

    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,

            Bundle savedInstanceState) {

        if (Utils.isTelevision(getContext())) {

        if (DeviceUtils.isTelevision(getContext())) {

            mGridView = (VerticalGridView) inflater.inflate(

                    R.layout.leanback_preferences_list, parent, false);

            mGridView.setWindowAlignmentOffset(0);

src/com/android/packageinstaller/permission/ui/television/SettingsWithHeader.java

+2 −1
Original line number Diff line number Diff line
@@ -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();