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

Commit e1556cf2 authored by Raff Tsai's avatar Raff Tsai
Browse files

Change InputMethodPreference icon size 

Test: manual
Fixes: 134406100
Change-Id: I7107eec598375cece7708001799f0c2c2592d4b5
parent 2a383060

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+15 −2
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.os.UserHandle; 
import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.View;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.TextView;



import androidx.core.content.res.TypedArrayUtils;
@@ -39,6 +41,7 @@ public class RestrictedSwitchPreference extends SwitchPreference { 
    RestrictedPreferenceHelper mHelper;

    boolean mUseAdditionalSummary = false;

    CharSequence mRestrictedSwitchSummary;

    private int mIconSize;



    public RestrictedSwitchPreference(Context context, AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {
@@ -87,6 +90,10 @@ public class RestrictedSwitchPreference extends SwitchPreference { 
        this(context, null);

    }



    public void setIconSize(int iconSize) {

        mIconSize = iconSize;

    }



    @Override

    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);
@@ -109,6 +116,12 @@ public class RestrictedSwitchPreference extends SwitchPreference { 
            switchWidget.setVisibility(isDisabledByAdmin() ? View.GONE : View.VISIBLE);

        }



        final ImageView icon = holder.itemView.findViewById(android.R.id.icon);



        if (mIconSize > 0) {

            icon.setLayoutParams(new LinearLayout.LayoutParams(mIconSize, mIconSize));

        }



        if (mUseAdditionalSummary) {

            final TextView additionalSummaryView = (TextView) holder.findViewById(

                    R.id.additional_summary);

packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ public class InputMethodPreference extends RestrictedSwitchPreference implements 
            // Remove switch widget.

            setWidgetLayoutResource(NO_WIDGET);

        }

        setIconSize(context.getResources().getDimensionPixelSize(R.dimen.secondary_app_icon_size));

    }



    @VisibleForTesting

packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedSwitchPreferenceTest.java

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib;



import static com.google.common.truth.Truth.assertThat;



import android.content.Context;

import android.view.View;

import android.view.ViewGroup;

import android.widget.ImageView;



import androidx.preference.PreferenceViewHolder;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class RestrictedSwitchPreferenceTest {



    private static final int SIZE = 50;



    private RestrictedSwitchPreference mPreference;

    private Context mContext;

    private PreferenceViewHolder mViewHolder;

    private View mRootView;

    private ImageView mImageView;



    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mPreference = new RestrictedSwitchPreference(mContext);

        mRootView = View.inflate(mContext, R.layout.restricted_switch_preference,

                null /* parent */);

        mViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);

        mImageView = (ImageView) mViewHolder.findViewById(android.R.id.icon);

    }



    @Test

    public void onBindViewHolder_setIconSize_shouldHaveCorrectLayoutParam() {

        mPreference.setIconSize(SIZE);



        mPreference.onBindViewHolder(mViewHolder);



        assertThat(mImageView.getLayoutParams().height).isEqualTo(SIZE);

        assertThat(mImageView.getLayoutParams().width).isEqualTo(SIZE);

    }



    @Test

    public void onBindViewHolder_notSetIconSize_shouldHaveCorrectLayoutParam() {

        mPreference.onBindViewHolder(mViewHolder);



        assertThat(mImageView.getLayoutParams().height).isEqualTo(

                ViewGroup.LayoutParams.WRAP_CONTENT);

        assertThat(mImageView.getLayoutParams().width).isEqualTo(

                ViewGroup.LayoutParams.WRAP_CONTENT);

    }

}