From 2c9d620091d86155b47e1dff0dacbb18993e7c86 Mon Sep 17 00:00:00 2001 From: arangelov Date: Tue, 20 Mar 2018 14:53:55 +0000 Subject: [PATCH] Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles. Screenshot: https://screenshot.googleplex.com/iz3xoeSvbOA.png Test: Manually go to Settings -> Apps & notifications -> Default apps -> Home app. Test: make ROBOTEST_FILTER=RadioButtonPreferenceTest -j40 RunSettingsRoboTests Bug: 69297461 Change-Id: I55c721d7ad979c882bb879a974758cf08eaf0c86 --- .../widget/RadioButtonPreference.java | 8 ++ .../widget/RadioButtonPreferenceTest.java | 83 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index cf5921eca8f..d386698c020 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -20,7 +20,9 @@ import android.content.Context; import android.support.v4.content.res.TypedArrayUtils; import android.support.v7.preference.CheckBoxPreference; import android.support.v7.preference.PreferenceViewHolder; +import android.text.TextUtils; import android.util.AttributeSet; +import android.view.View; import android.widget.TextView; import com.android.settings.R; @@ -72,6 +74,12 @@ public class RadioButtonPreference extends CheckBoxPreference { public void onBindViewHolder(PreferenceViewHolder view) { super.onBindViewHolder(view); + View summaryContainer = view.findViewById(R.id.summary_container); + if (summaryContainer != null) { + summaryContainer.setVisibility( + TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE); + } + TextView title = (TextView) view.findViewById(android.R.id.title); if (title != null) { title.setSingleLine(false); diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java new file mode 100644 index 00000000000..e8a705c94c8 --- /dev/null +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2018 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 junit.framework.Assert.assertEquals; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.app.Application; +import android.support.v7.preference.PreferenceViewHolder; +import android.view.View; + +import com.android.settings.R; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RuntimeEnvironment; + +@RunWith(SettingsRobolectricTestRunner.class) +public class RadioButtonPreferenceTest { + + private Application mContext; + private RadioButtonPreference mPreference; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + mPreference = new RadioButtonPreference(mContext); + } + + @Test + public void summary_containerShouldBeVisible() { + mPreference.setSummary("some summary"); + View summaryContainer = new View(mContext); + View view = mock(View.class); + when(view.findViewById(R.id.summary_container)).thenReturn(summaryContainer); + PreferenceViewHolder preferenceViewHolder = + PreferenceViewHolder.createInstanceForTests(view); + mPreference.onBindViewHolder(preferenceViewHolder); + assertEquals(View.VISIBLE, summaryContainer.getVisibility()); + } + + @Test + public void emptySummary_containerShouldBeGone() { + mPreference.setSummary(""); + View summaryContainer = new View(mContext); + View view = mock(View.class); + when(view.findViewById(R.id.summary_container)).thenReturn(summaryContainer); + PreferenceViewHolder preferenceViewHolder = + PreferenceViewHolder.createInstanceForTests(view); + mPreference.onBindViewHolder(preferenceViewHolder); + assertEquals(View.GONE, summaryContainer.getVisibility()); + } + + @Test + public void nullSummary_containerShouldBeGone() { + mPreference.setSummary(null); + View summaryContainer = new View(mContext); + View view = mock(View.class); + when(view.findViewById(R.id.summary_container)).thenReturn(summaryContainer); + PreferenceViewHolder preferenceViewHolder = + PreferenceViewHolder.createInstanceForTests(view); + mPreference.onBindViewHolder(preferenceViewHolder); + assertEquals(View.GONE, summaryContainer.getVisibility()); + } +}