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

Commit e249c00a authored by Doris Ling's avatar Doris Ling
Browse files

Limit the summary text for App info->Permissions to one line. 

- the summary text is the list of permissions that the app has. It is
dynamic, and when the list is long, setting the summary will expand
the text view height and make the page launch looks janky. We cannot
pre-set the summary to certain line, since the permissions list for each
app is unknown beforehand. To avoid the jank, limit the summary to 1
line and truncate it if necessary.

Change-Id: I1acb1ac9f46c55808ce03626e53cf71502231ab2
Fix: 36413664
Test: make RunSettingsRoboTests
parent cdf5fe0d

res/xml/installed_app_details_ia.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
        android:title="@string/notifications_label"

        android:selectable="true"/>



    <Preference

    <com.android.settings.widget.SingleLineSummaryPreference

        android:key="permission_settings"

        android:title="@string/permissions_label"

        android:summary="@string/summary_placeholder"

src/com/android/settings/widget/SingleLineSummaryPreference.java

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

 * Copyright (C) 2017 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.settings.widget;



import android.content.Context;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.text.TextUtils.TruncateAt;

import android.util.AttributeSet;

import android.widget.TextView;



/**

 * A preference whose summary text will only span one single line.

 */

public class SingleLineSummaryPreference extends Preference {



    public SingleLineSummaryPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        TextView summary = (TextView) holder.findViewById(android.R.id.summary);

        if (summary != null) {

            summary.setSingleLine();

            summary.setEllipsize(TruncateAt.END);

        }

    }

}

tests/robotests/src/com/android/settings/widget/SingleLineSummaryPreferenceTest.java

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

 * Copyright (C) 2017 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.settings.widget;



import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.support.v7.preference.PreferenceViewHolder;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.LinearLayout;

import android.widget.TextView;

import com.android.settings.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.widget.SingleLineSummaryPreference;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class SingleLineSummaryPreferenceTest {



    @Mock private TextView mSummary;



    private Context mContext;

    private PreferenceViewHolder mHolder;

    private SingleLineSummaryPreference mPreference;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mContext = RuntimeEnvironment.application;

        mPreference = new SingleLineSummaryPreference(mContext, null);

        LayoutInflater inflater = LayoutInflater.from(mContext);

        final View view = inflater.inflate(mPreference.getLayoutResource(),

            new LinearLayout(mContext), false);

        mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));

        when(mHolder.findViewById(android.R.id.summary)).thenReturn(mSummary);

    }



    @Test

    public void onBindViewHolder_shouldSetSingleLine() {

        mPreference.onBindViewHolder(mHolder);

        final TextView summary = (TextView) mHolder.findViewById(android.R.id.summary);



        verify(mSummary).setSingleLine();

    }

}