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

Commit df0aa853 authored by Joel Galenson's avatar Joel Galenson
Browse files

Remove icons from the permission filter dialog. 

Bug: 129289903
Test: View and click various permissions in the dialog.
Change-Id: Id18eeef0a299ea378fa8f8135824496eaf07b296
parent ccf387d6

res/layout/permission_filter_dialog_item.xml

+0 −9
Original line number Diff line number Diff line
@@ -23,15 +23,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />



    <LinearLayout

        style="@style/PermissionFilterDialogItemIconFrame">



        <ImageView

            android:id="@+id/icon"

            style="@style/PermissionFilterDialogItemIcon"/>



    </LinearLayout>



    <LinearLayout

        style="@style/PermissionFilterDialogItemTextFrame">

res/values/overlayable.xml

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ 
            <item type="style" name="PermissionFilterDialogInnerContainer" />

            <item type="style" name="PermissionFilterDialogItemsContainer" />

            <item type="style" name="PermissionFilterDialogItemContainer" />

            <item type="style" name="PermissionFilterDialogItemIconFrame" />

            <item type="style" name="PermissionFilterDialogItemIcon" />

            <item type="style" name="PermissionFilterDialogItemTextFrame" />

            <item type="style" name="PermissionFilterDialogItemTitle" />

            <item type="style" name="PermissionFilterDialogItemSummary" />

res/values/styles.xml

+0 −13
Original line number Diff line number Diff line
@@ -345,19 +345,6 @@ 
        <item name="android:gravity">center_vertical</item>

    </style>



    <style name="PermissionFilterDialogItemIconFrame">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_gravity">start|center_vertical</item>

        <item name="android:layout_marginStart">16dp</item>

    </style>



    <style name="PermissionFilterDialogItemIcon">

        <item name="android:layout_width">24dp</item>

        <item name="android:layout_height">24dp</item>

        <item name="android:scaleType">fitCenter</item>

    </style>



    <style name="PermissionFilterDialogItemTextFrame">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

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

+0 −12
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.view.MenuInflater; 
import android.view.MenuItem;

import android.view.View;

import android.view.ViewGroup;

import android.widget.ImageView;

import android.widget.RadioButton;

import android.widget.TextView;
@@ -734,11 +733,9 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
        // Create the dialog entries.

        String[] groupNames = new String[groups.size() + 1];

        CharSequence[] groupLabels = new CharSequence[groupNames.length];

        int[] groupIcons = new int[groupNames.length];

        int[] groupAccessCounts = new int[groupNames.length];

        groupNames[0] = null;

        groupLabels[0] = context.getString(R.string.permission_usage_any_permission);

        groupIcons[0] = 0;

        groupAccessCounts[0] = mGroupAppCounts.get(null);

        int selection = 0;

        int numGroups = groups.size();
@@ -746,7 +743,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
            AppPermissionGroup group = groups.get(i);

            groupNames[i + 1] = group.getName();

            groupLabels[i + 1] = group.getLabel();

            groupIcons[i + 1] = group.getIconResId();

            Integer appCount = mGroupAppCounts.get(group.getName());

            if (appCount == null) {

                appCount = 0;
@@ -764,7 +760,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
        args.putCharSequenceArray(PermissionsFilterDialog.ELEMS, groupLabels);

        args.putInt(PermissionsFilterDialog.SELECTION, selection);

        args.putStringArray(PermissionsFilterDialog.GROUPS, groupNames);

        args.putIntArray(PermissionsFilterDialog.ICONS, groupIcons);

        args.putIntArray(PermissionsFilterDialog.ACCESS_COUNTS, groupAccessCounts);

        PermissionsFilterDialog chooserDialog = new PermissionsFilterDialog();

        chooserDialog.setArguments(args);
@@ -797,8 +792,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
                + ".arg.selection";

        private static final String GROUPS = PermissionsFilterDialog.class.getName()

                + ".arg.groups";

        private static final String ICONS = PermissionsFilterDialog.class.getName()

                + ".arg.icons";

        private static final String ACCESS_COUNTS = PermissionsFilterDialog.class.getName()

                + ".arg.access_counts";
@@ -814,7 +807,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
            PermissionUsageFragment fragment = (PermissionUsageFragment) getTargetFragment();

            CharSequence[] elems = getArguments().getCharSequenceArray(ELEMS);

            String[] groups = getArguments().getStringArray(GROUPS);

            int[] icons = getArguments().getIntArray(ICONS);

            int[] accessCounts = getArguments().getIntArray(ACCESS_COUNTS);

            int selectedIndex = getArguments().getInt(SELECTION);
@@ -830,10 +822,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
                View itemView = layoutInflater.inflate(R.layout.permission_filter_dialog_item,

                        itemsListView, false);



                ((ImageView) itemView.requireViewById(R.id.icon)).setImageDrawable(

                        icons[i] == 0 ? null : Utils.applyTint(getActivity(),

                                getActivity().getDrawable(icons[i]),

                                android.R.attr.colorControlNormal));

                ((TextView) itemView.requireViewById(R.id.title)).setText(elems[i]);

                ((TextView) itemView.requireViewById(R.id.summary)).setText(

                        getActivity().getResources().getQuantityString(