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

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

Merge "Add TV UI support for one time permission" into rvc-dev

parents 60a544cc 15195f78

res/layout-television/grant_permissions.xml

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ 
            android:text="@string/grant_dialog_button_allow"

            style="@style/GrantPermissions.ActionItem" />



        <Button

            android:id="@+id/permission_allow_one_time_button"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/grant_dialog_button_allow_one_time"

            style="@style/GrantPermissions.ActionItem" />



        <Button

            android:id="@+id/permission_deny_button"

            android:layout_width="match_parent"

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

+11 −2
Original line number Diff line number Diff line 
package com.android.permissioncontroller.permission.ui.television;



import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_ONE_TIME_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.DENY_AND_DONT_ASK_AGAIN_BUTTON;



import android.content.Context;
@@ -37,6 +38,7 @@ public final class GrantPermissionsViewHandlerImpl implements GrantPermissionsVi 
    private ImageView mIconView;

    private TextView mCurrentGroupView;

    private Button mAllowButton;

    private Button mAllowOneTimeButton;

    private Button mSoftDenyButton;

    private Button mHardDenyButton;
@@ -59,11 +61,14 @@ public final class GrantPermissionsViewHandlerImpl implements GrantPermissionsVi 
        mIconView = (ImageView) mRootView.findViewById(R.id.permission_icon);

        mCurrentGroupView = (TextView) mRootView.findViewById(R.id.current_page_text);

        mAllowButton = (Button) mRootView.findViewById(R.id.permission_allow_button);

        mAllowOneTimeButton =

                (Button) mRootView.findViewById(R.id.permission_allow_one_time_button);

        mSoftDenyButton = (Button) mRootView.findViewById(R.id.permission_deny_button);

        mHardDenyButton = (Button) mRootView.findViewById(

                R.id.permission_deny_dont_ask_again_button);



        mAllowButton.setOnClickListener(this);

        mAllowOneTimeButton.setOnClickListener(this);

        mSoftDenyButton.setOnClickListener(this);

        mHardDenyButton.setOnClickListener(this);
@@ -93,9 +98,10 @@ public final class GrantPermissionsViewHandlerImpl implements GrantPermissionsVi 
            mIconView.setImageIcon(icon);

        }



        mAllowOneTimeButton.setVisibility(

                buttonVisibilities[ALLOW_ONE_TIME_BUTTON] ? View.VISIBLE : View.GONE);

        mHardDenyButton.setVisibility(

                buttonVisibilities[DENY_AND_DONT_ASK_AGAIN_BUTTON] ? View.VISIBLE

                        : View.GONE);

                buttonVisibilities[DENY_AND_DONT_ASK_AGAIN_BUTTON] ? View.VISIBLE : View.GONE);

        if (groupCount > 1) {

            mCurrentGroupView.setVisibility(View.VISIBLE);

            mCurrentGroupView.setText(mContext.getString(R.string.current_permission_template,
@@ -121,6 +127,9 @@ public final class GrantPermissionsViewHandlerImpl implements GrantPermissionsVi 
            case R.id.permission_allow_button:

                mResultListener.onPermissionGrantResult(mGroupName, GRANTED_ALWAYS);

                break;

            case R.id.permission_allow_one_time_button:

                mResultListener.onPermissionGrantResult(mGroupName, GRANTED_ONE_TIME);

                break;

            case R.id.permission_deny_button:

                mResultListener.onPermissionGrantResult(mGroupName, DENIED);

                break;