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

Commit 26ea1742 authored by Tony Mantler's avatar Tony Mantler
Browse files

Fix additional permissions count 

Also tidy some inspections

Bug: 34457894
Test: Settings -> Apps -> [app with permissions] -> Permissions
Change-Id: I416215d4af0872ce8242ec505e78b8657c5d4ad6
parent fae06c0e

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

+19 −33
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.app.Activity; 
import android.app.AlertDialog;

import android.app.Fragment;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;
@@ -34,7 +32,6 @@ import android.provider.Settings; 
import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;

import android.support.v7.preference.Preference.OnPreferenceClickListener;

import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.PreferenceViewHolder;

import android.util.Log;
@@ -45,7 +42,6 @@ import android.view.View; 
import android.widget.Toast;



import com.android.packageinstaller.R;



import com.android.packageinstaller.permission.model.AppPermissionGroup;

import com.android.packageinstaller.permission.model.AppPermissions;

import com.android.packageinstaller.permission.ui.ReviewPermissionsActivity;
@@ -102,12 +98,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader 
        }





        mAppPermissions = new AppPermissions(activity, packageInfo, null, true, new Runnable() {

            @Override

            public void run() {

                getActivity().finish();

            }

        });

        mAppPermissions = new AppPermissions(activity, packageInfo, null, true,

                () -> getActivity().finish());



        if (mAppPermissions.isReviewRequired()) {

            Intent intent = new Intent(getActivity(), ReviewPermissionsActivity.class);
@@ -232,9 +224,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader 
        }



        if (mExtraScreen != null) {

            extraPerms.setOnPreferenceClickListener(new OnPreferenceClickListener() {

                @Override

                public boolean onPreferenceClick(Preference preference) {

            extraPerms.setOnPreferenceClickListener(preference -> {

                AdditionalPermissionsFragment frag = new AdditionalPermissionsFragment();

                setPackageName(frag, getArguments().getString(Intent.EXTRA_PACKAGE_NAME));

                frag.setTargetFragment(AppPermissionsFragment.this, 0);
@@ -243,9 +233,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader 
                        .addToBackStack(null)

                        .commit();

                return true;

                }

            });

            int count = mExtraScreen.getPreferenceCount();

            int count = mExtraScreen.getPreferenceCount() - 1;

            extraPerms.setSummary(getResources().getQuantityString(

                    R.plurals.additional_permissions_more, count, count));

            screen.addPreference(extraPerms);
@@ -304,15 +293,12 @@ public final class AppPermissionsFragment extends SettingsWithHeader 
                                : R.string.old_sdk_deny_warning)

                        .setNegativeButton(R.string.cancel, null)

                        .setPositiveButton(R.string.grant_dialog_button_deny_anyway,

                                new OnClickListener() {

                            @Override

                            public void onClick(DialogInterface dialog, int which) {

                                (dialog, which) -> {

                                    ((SwitchPreference) preference).setChecked(false);

                                    group.revokeRuntimePermissions(false);

                                    if (!grantedByDefault) {

                                        mHasConfirmedRevoke = true;

                                    }

                            }

                                })

                        .show();

                return false;