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

Commit 84e3c2e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cts-permissions-rvc-tv" into rvc-dev 

* changes:
  Set the ID of TV grant layout to grant_dialog
  Fix regression (infinite loop) in TV launch path
  TV: Fix launch for "Deny Anyway" permission dialog
parents d4febdbe d3d6723e

res/layout-television/grant_permissions.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/grant_dialog"

    android:orientation="horizontal"

    android:paddingLeft="@dimen/action_dialog_padding_left"

    android:paddingRight="@dimen/action_dialog_padding_right"

src/com/android/permissioncontroller/permission/ui/legacy/AppPermissionActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.permissioncontroller.permission.ui.GrantPermissionsViewHandle 
import com.android.permissioncontroller.permission.ui.LocationProviderInterceptDialog;

import com.android.permissioncontroller.permission.ui.ManagePermissionsActivity;

import com.android.permissioncontroller.permission.ui.auto.AutoAppPermissionFragment;

import com.android.permissioncontroller.permission.ui.television.AppPermissionFragment;

import com.android.permissioncontroller.permission.utils.LocationUtils;

import com.android.permissioncontroller.permission.utils.Utils;
@@ -150,6 +151,14 @@ public final class AppPermissionActivity extends FragmentActivity { 


            getSupportFragmentManager().beginTransaction().replace(android.R.id.content,

                    androidXFragment).commit();

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

            Fragment androidXFragment = new AppPermissionFragment();

            androidXFragment.setArguments(

                    AppPermissionFragment.createArgs(

                            packageName, permissionName, groupName, userHandle, null, 0, null));

            getSupportFragmentManager().beginTransaction()

                    .replace(android.R.id.content, androidXFragment)

                    .commit();

        } else {

            startActivity(new Intent(getIntent()).setAction(ACTION_MANAGE_APP_PERMISSION));

            finish();

src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java

+4 −4
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ public class AppPermissionFragment extends SettingsWithHeader 
                .putExtra(EXTRA_RESULT_PERMISSION_INTERACTED, mPermGroupName)

                .putExtra(EXTRA_RESULT_PERMISSION_RESULT, result);

        getActivity().setResult(Activity.RESULT_OK, intent);

        getActivity().onBackPressed();

    }



    /**
@@ -418,7 +417,8 @@ public class AppPermissionFragment extends SettingsWithHeader 
        ConfirmDialog defaultDenyDialog = new ConfirmDialog();

        defaultDenyDialog.setCancelable(true);

        defaultDenyDialog.setArguments(args);

        defaultDenyDialog.show(getChildFragmentManager().beginTransaction(),

        defaultDenyDialog.setTargetFragment(this, 0);

        defaultDenyDialog.show(getFragmentManager(),

                ConfirmDialog.class.getName());

    }
@@ -440,7 +440,7 @@ public class AppPermissionFragment extends SettingsWithHeader 


        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            AppPermissionFragment fragment = (AppPermissionFragment) getParentFragment();

            AppPermissionFragment fragment = (AppPermissionFragment) getTargetFragment();

            boolean isGrantFileAccess = getArguments().getSerializable(CHANGE_REQUEST)

                    == ChangeRequest.GRANT_All_FILE_ACCESS;

            int positiveButtonStringResId = R.string.grant_dialog_button_deny_anyway;
@@ -469,7 +469,7 @@ public class AppPermissionFragment extends SettingsWithHeader 


        @Override

        public void onCancel(DialogInterface dialog) {

            AppPermissionFragment fragment = (AppPermissionFragment) getParentFragment();

            AppPermissionFragment fragment = (AppPermissionFragment) getTargetFragment();

            fragment.setRadioButtonsState(fragment.mViewModel.getButtonStateLiveData().getValue());

        }

    }