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

Commit e352845e authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Fix toggle button clickability in app restrictions" into lmp-dev

parents a1ca4ed1 3391321e

res/layout/preference_app_restrictions.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:paddingStart="@*android:dimen/preference_item_padding_side">

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >



    <LinearLayout

        android:layout_width="wrap_content"

src/com/android/settings/users/AppRestrictionsFragment.java

+2 −17
Original line number Diff line number Diff line
@@ -159,34 +159,17 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen 
        private boolean panelOpen;

        private boolean immutable;

        private List<Preference> mChildren = new ArrayList<Preference>();

        private final ColorFilter grayscaleFilter;



        AppRestrictionsPreference(Context context, OnClickListener listener) {

            super(context);

            setLayoutResource(R.layout.preference_app_restrictions);

            this.listener = listener;



            ColorMatrix colorMatrix = new ColorMatrix();

            colorMatrix.setSaturation(0f);

            float[] matrix = colorMatrix.getArray();

            matrix[18] = 0.5f;

            grayscaleFilter = new ColorMatrixColorFilter(colorMatrix);

        }



        private void setSettingsEnabled(boolean enable) {

            hasSettings = enable;

        }



        @Override

        public void setChecked(boolean checked) {

            if (checked) {

                getIcon().setColorFilter(null);

            } else {

                getIcon().setColorFilter(grayscaleFilter);

            }

            super.setChecked(checked);

        }



        void setRestrictions(ArrayList<RestrictionEntry> restrictions) {

            this.restrictions = restrictions;

        }
@@ -246,6 +229,8 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen 
                final Switch toggle = (Switch) widget.getChildAt(0);

                toggle.setEnabled(!isImmutable());

                toggle.setTag(this);

                toggle.setClickable(true);

                toggle.setFocusable(true);

                toggle.setOnCheckedChangeListener(new OnCheckedChangeListener() {

                    @Override

                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {