diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0404d0b5f2c..10b91cbed06 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1014,6 +1014,8 @@ + diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml deleted file mode 100644 index c339e675f21..00000000000 --- a/res/layout/preference_bluetooth.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/res/layout/preference_master_switch.xml b/res/layout/preference_master_switch.xml deleted file mode 100644 index c7dd6d69693..00000000000 --- a/res/layout/preference_master_switch.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml index 138069829f7..9f5a8b4d10e 100644 --- a/res/layout/preference_progress_category.xml +++ b/res/layout/preference_progress_category.xml @@ -35,7 +35,6 @@ android:id="@android:id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:tint="?android:attr/textColorPrimary" android:maxWidth="18dp" android:maxHeight="18dp"/> @@ -47,7 +46,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="start|center" - android:textAppearance="@android:style/TextAppearance.Material.Body2"/> + android:textAppearance="@android:style/TextAppearance.Material.Body2" + android:textColor="?android:attr/colorAccent"/> + + + + + diff --git a/res/layout/preference_widget_master_switch.xml b/res/layout/preference_widget_master_switch.xml index ee335f173b3..7e28be90d13 100644 --- a/res/layout/preference_widget_master_switch.xml +++ b/res/layout/preference_widget_master_switch.xml @@ -15,28 +15,12 @@ limitations under the License. --> - - - - - - - - - + diff --git a/res/layout/preference_widget_settings.xml b/res/layout/preference_widget_settings.xml deleted file mode 100644 index dfeca1a4431..00000000000 --- a/res/layout/preference_widget_settings.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 541f29dbba0..790b916cc6b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -222,8 +222,6 @@ Bluetooth devices Device name - - Device settings Profile settings @@ -7598,7 +7596,7 @@ Performance is reduced. Location services and background data are turned off. - + Mobile data is off diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 5bddffa28b3..7be6dd711fe 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -30,14 +30,13 @@ import android.text.TextUtils; import android.util.Log; import android.util.Pair; import android.util.TypedValue; -import android.view.View; -import android.view.View.OnClickListener; import android.widget.ImageView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.widget.GearPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HidProfile; import com.android.settingslib.bluetooth.LocalBluetoothProfile; @@ -50,15 +49,14 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; * BluetoothDevicePreference is the preference type used to display each remote * Bluetooth device in the Bluetooth Settings screen. */ -public final class BluetoothDevicePreference extends Preference implements - CachedBluetoothDevice.Callback, OnClickListener { - private static final String TAG = "BluetoothDevicePreference"; +public final class BluetoothDevicePreference extends GearPreference implements + CachedBluetoothDevice.Callback { + private static final String TAG = "BluetoothDevicePref"; private static int sDimAlpha = Integer.MIN_VALUE; private final CachedBluetoothDevice mCachedDevice; - - private OnClickListener mOnSettingsClickListener; + private final UserManager mUserManager; private AlertDialog mDisconnectDialog; @@ -76,7 +74,8 @@ public final class BluetoothDevicePreference extends Preference implements public final String BLUETOOTH = r.getString(R.string.bluetooth_talkback_bluetooth); public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) { - super(context); + super(context, null); + mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); if (sDimAlpha == Integer.MIN_VALUE) { TypedValue outValue = new TypedValue(); @@ -85,14 +84,6 @@ public final class BluetoothDevicePreference extends Preference implements } mCachedDevice = cachedDevice; - - if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) { - UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); - if (!um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) { - setWidgetLayoutResource(R.layout.preference_bluetooth); - } - } - mCachedDevice.registerCallback(this); onDeviceAttributesChanged(); @@ -102,12 +93,20 @@ public final class BluetoothDevicePreference extends Preference implements notifyChanged(); } - CachedBluetoothDevice getCachedDevice() { - return mCachedDevice; + @Override + protected boolean shouldHideSecondTarget() { + return mCachedDevice == null + || mCachedDevice.getBondState() != BluetoothDevice.BOND_BONDED + || mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH); } - public void setOnSettingsClickListener(OnClickListener listener) { - mOnSettingsClickListener = listener; + @Override + protected int getSecondTargetResId() { + return R.layout.preference_widget_gear; + } + + CachedBluetoothDevice getCachedDevice() { + return mCachedDevice; } @Override @@ -120,6 +119,10 @@ public final class BluetoothDevicePreference extends Preference implements } } + public CachedBluetoothDevice getBluetoothDevice() { + return mCachedDevice; + } + public void onDeviceAttributesChanged() { /* * The preference framework takes care of making sure the value has @@ -157,11 +160,10 @@ public final class BluetoothDevicePreference extends Preference implements } if (mCachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) { - ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails); + ImageView deviceDetails = (ImageView) view.findViewById(R.id.settings_button); if (deviceDetails != null) { deviceDetails.setOnClickListener(this); - deviceDetails.setTag(mCachedDevice); } } final ImageView imageView = (ImageView) view.findViewById(android.R.id.icon); @@ -171,13 +173,6 @@ public final class BluetoothDevicePreference extends Preference implements super.onBindViewHolder(view); } - public void onClick(View v) { - // Should never be null by construction - if (mOnSettingsClickListener != null) { - mOnSettingsClickListener.onClick(v); - } - } - @Override public boolean equals(Object o) { if ((o == null) || !(o instanceof BluetoothDevicePreference)) { @@ -207,19 +202,19 @@ public final class BluetoothDevicePreference extends Preference implements int bondState = mCachedDevice.getBondState(); final MetricsFeatureProvider metricsFeatureProvider = - FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); + FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider(); if (mCachedDevice.isConnected()) { metricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT); + MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT); askDisconnect(); } else if (bondState == BluetoothDevice.BOND_BONDED) { metricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT); + MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT); mCachedDevice.connect(true); } else if (bondState == BluetoothDevice.BOND_NONE) { metricsFeatureProvider.action(getContext(), - MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR); + MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR); pair(); } } @@ -283,10 +278,10 @@ public final class BluetoothDevicePreference extends Preference implements } } if (btClass != null) { - if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) { + if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) { return new Pair(R.drawable.ic_bt_headset_hfp, HEADSET); } - if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) { + if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) { return new Pair(R.drawable.ic_bt_headphones_a2dp, HEADPHONE); } } diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 5679f906f60..317a350d80a 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -45,13 +45,14 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.FooterPreference; +import com.android.settings.widget.GearPreference; +import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; @@ -476,24 +477,25 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem } } - private final View.OnClickListener mDeviceProfilesListener = new View.OnClickListener() { - @Override - public void onClick(View v) { - // User clicked on advanced options icon for a device in the list - if (!(v.getTag() instanceof CachedBluetoothDevice)) { - Log.w(TAG, "onClick() called for other View: " + v); - return; - } - - final CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag(); - Bundle args = new Bundle(); - args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS, - device.getDevice().getAddress()); - DeviceProfilesSettings profileSettings = new DeviceProfilesSettings(); - profileSettings.setArguments(args); - profileSettings.show(getFragmentManager(), - DeviceProfilesSettings.class.getSimpleName()); + private final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> { + // User clicked on advanced options icon for a device in the list + if (!(pref instanceof BluetoothDevicePreference)) { + Log.w(TAG, "onClick() called for other View: " + pref); + return; } + final CachedBluetoothDevice device = + ((BluetoothDevicePreference) pref).getBluetoothDevice(); + if (device == null) { + Log.w(TAG, "No BT device attached with this pref: " + pref); + return; + } + final Bundle args = new Bundle(); + args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS, + device.getDevice().getAddress()); + final DeviceProfilesSettings profileSettings = new DeviceProfilesSettings(); + profileSettings.setArguments(args); + profileSettings.show(getFragmentManager(), + DeviceProfilesSettings.class.getSimpleName()); }; /** @@ -506,7 +508,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem CachedBluetoothDevice cachedDevice = preference.getCachedDevice(); if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) { // Only paired device have an associated advanced settings screen - preference.setOnSettingsClickListener(mDeviceProfilesListener); + preference.setOnGearClickListener(mDeviceProfilesListener); } } diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index c730bcc01d7..02a2e291b5d 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -21,7 +21,6 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.support.v7.preference.ListPreference; import android.support.v7.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; @@ -46,7 +45,7 @@ class SpellCheckerPreference extends CustomListPreference { public SpellCheckerPreference(final Context context, final SpellCheckerInfo[] scis) { super(context, null); mScis = scis; - setWidgetLayoutResource(R.layout.preference_widget_settings); + setWidgetLayoutResource(R.layout.preference_widget_gear); CharSequence[] labels = new CharSequence[scis.length]; CharSequence[] values = new CharSequence[scis.length]; for (int i = 0 ; i < scis.length; i++) { diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java index 4738728a5f4..072d454ff58 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreference.java +++ b/src/com/android/settings/nfc/NfcPaymentPreference.java @@ -15,7 +15,6 @@ */ package com.android.settings.nfc; -import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Context; @@ -33,7 +32,6 @@ import android.widget.RadioButton; import com.android.settings.CustomDialogPreference; import com.android.settings.R; -import com.android.settings.dashboard.SummaryLoader; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; import java.util.List; @@ -59,7 +57,7 @@ public class NfcPaymentPreference extends CustomDialogPreference implements mAdapter = new NfcPaymentAdapter(); setDialogTitle(context.getString(R.string.nfc_payment_pay_with)); mLayoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - setWidgetLayoutResource(R.layout.preference_widget_settings); + setWidgetLayoutResource(R.layout.preference_widget_gear); refresh(); } diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index 7659f0ff5d9..95937989b49 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -33,7 +33,6 @@ public class GearPreference extends RestrictedPreference implements View.OnClick public GearPreference(Context context, AttributeSet attrs) { super(context, attrs); - setWidgetLayoutResource(R.layout.preference_widget_settings); } public void setOnGearClickListener(OnGearClickListener l) { @@ -41,6 +40,16 @@ public class GearPreference extends RestrictedPreference implements View.OnClick notifyChanged(); } + @Override + protected int getSecondTargetResId() { + return R.layout.preference_widget_gear; + } + + @Override + protected boolean shouldHideSecondTarget() { + return mOnGearClickListener == null; + } + @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java index 84f1532dab8..3a771bbbbf3 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; @@ -27,12 +26,13 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import com.android.settingslib.TwoTargetPreference; /** * A custom preference that provides inline switch toggle. It has a mandatory field for title, and * optional fields for icon and sub-text. */ -public class MasterSwitchPreference extends Preference { +public class MasterSwitchPreference extends TwoTargetPreference { private Switch mSwitch; private boolean mChecked; @@ -41,28 +41,29 @@ public class MasterSwitchPreference extends Preference { public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - init(); } public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - init(); } public MasterSwitchPreference(Context context, AttributeSet attrs) { super(context, attrs); - init(); } public MasterSwitchPreference(Context context) { super(context); - init(); + } + + @Override + protected int getSecondTargetResId() { + return R.layout.preference_widget_master_switch; } @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); - final View widgetView = holder.itemView.findViewById(android.R.id.widget_frame); + final View widgetView = holder.findViewById(android.R.id.widget_frame); if (widgetView != null) { widgetView.setOnClickListener(new OnClickListener() { @Override @@ -76,12 +77,12 @@ public class MasterSwitchPreference extends Preference { } }); } - mSwitch = (Switch) holder.itemView.findViewById(R.id.switchWidget); + mSwitch = (Switch) holder.findViewById(R.id.switchWidget); if (mSwitch != null) { mSwitch.setChecked(mChecked); } if (mMultiLine) { - TextView textView = (TextView)holder.findViewById(android.R.id.title); + TextView textView = (TextView) holder.findViewById(android.R.id.title); if (textView != null) { textView.setSingleLine(false); } @@ -99,10 +100,6 @@ public class MasterSwitchPreference extends Preference { } } - public boolean isSwitchEnabled() { - return mSwitch != null && mSwitch.isEnabled(); - } - public void setSwitchEnabled(boolean enabled) { if (mSwitch != null) { mSwitch.setEnabled(enabled); @@ -128,9 +125,4 @@ public class MasterSwitchPreference extends Preference { public Switch getSwitch() { return mSwitch; } - - private void init() { - setLayoutResource(R.layout.preference_master_switch); - setWidgetLayoutResource(R.layout.preference_widget_master_switch); - } } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 59151180584..c4c1f8a89e8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -17,8 +17,10 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.content.Context; +import android.os.UserManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; @@ -32,7 +34,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -66,7 +71,7 @@ public class BluetoothDevicePreferenceTest { mPreference.onClicked(); verify(mMetricsFeatureProvider).action( - mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT); + mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT); } @Test @@ -77,7 +82,7 @@ public class BluetoothDevicePreferenceTest { mPreference.onClicked(); verify(mMetricsFeatureProvider).action( - mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT); + mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT); } @Test @@ -89,6 +94,46 @@ public class BluetoothDevicePreferenceTest { mPreference.onClicked(); verify(mMetricsFeatureProvider).action( - mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR); + mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR); + } + + @Test + public void getSecondTargetResource_shouldBeGearIconLayout() { + assertThat(mPreference.getSecondTargetResId()).isEqualTo(R.layout.preference_widget_gear); + } + + @Test + public void shouldHideSecondTarget_noDevice_shouldReturnTrue() { + ReflectionHelpers.setField(mPreference, "mCachedDevice", null); + + assertThat(mPreference.shouldHideSecondTarget()).isTrue(); + } + + @Test + public void shouldHideSecondTarget_notBond_shouldReturnTrue() { + when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE); + + assertThat(mPreference.shouldHideSecondTarget()).isTrue(); + } + + @Test + public void shouldHideSecondTarget_hasUserRestriction_shouldReturnTrue() { + final UserManager um = mock(UserManager.class); + ReflectionHelpers.setField(mPreference, "mUserManager", um); + when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH)) + .thenReturn(true); + + assertThat(mPreference.shouldHideSecondTarget()).isTrue(); + } + + @Test + public void shouldHideSecondTarget_hasBoundDeviceAndNoRestriction_shouldReturnFalse() { + when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + final UserManager um = mock(UserManager.class); + ReflectionHelpers.setField(mPreference, "mUserManager", um); + when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH)) + .thenReturn(false); + + assertThat(mPreference.shouldHideSecondTarget()).isFalse(); } } diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 7d2e24061b3..3936d14edd7 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -17,13 +17,10 @@ package com.android.settings.widget; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import android.support.v7.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; -import android.view.View.OnClickListener; -import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.LinearLayout; import android.widget.Switch; @@ -35,14 +32,11 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) @@ -53,23 +47,23 @@ public class MasterSwitchPreferenceTest { @Before public void setUp() { - mContext = ShadowApplication.getInstance().getApplicationContext(); + mContext = RuntimeEnvironment.application; } @Test public void createNewPreference_shouldSetLayout() { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); - assertThat(preference.getWidgetLayoutResource()).isEqualTo( - R.layout.preference_widget_master_switch); + assertThat(preference.getWidgetLayoutResource()) + .isEqualTo(R.layout.preference_widget_master_switch); } @Test public void setChecked_shouldUpdateButtonCheckedState() { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) - .inflate(R.layout.preference_widget_master_switch, null)); - final Switch toggle = (Switch) holder.itemView.findViewById(R.id.switchWidget); + .inflate(R.layout.preference_widget_master_switch, null)); + final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); preference.onBindViewHolder(holder); preference.setChecked(true); @@ -82,9 +76,9 @@ public class MasterSwitchPreferenceTest { @Test public void setSwitchEnabled_shouldUpdateButtonEnabledState() { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); - final PreferenceViewHolder holder = new PreferenceViewHolder( - LayoutInflater.from(mContext).inflate(R.layout.preference_widget_master_switch, null)); - final Switch toggle = (Switch) holder.itemView.findViewById(R.id.switchWidget); + final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) + .inflate(R.layout.preference_widget_master_switch, null)); + final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); preference.onBindViewHolder(holder); preference.setSwitchEnabled(true); @@ -99,10 +93,10 @@ public class MasterSwitchPreferenceTest { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final LayoutInflater inflater = LayoutInflater.from(mContext); final PreferenceViewHolder holder = new PreferenceViewHolder( - inflater.inflate(R.layout.preference_master_switch, null)); + inflater.inflate(R.layout.preference_two_target, null)); final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame); inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true); - final Switch toggle = (Switch) holder.itemView.findViewById(R.id.switchWidget); + final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); preference.onBindViewHolder(holder); widgetView.performClick(); @@ -116,8 +110,8 @@ public class MasterSwitchPreferenceTest { public void clickWidgetView_shouldNotifyPreferenceChanged() { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); final PreferenceViewHolder holder = new PreferenceViewHolder( - LayoutInflater.from(mContext).inflate(R.layout.preference_master_switch, null)); - final View widgetView = holder.itemView.findViewById(android.R.id.widget_frame); + LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null)); + final View widgetView = holder.findViewById(android.R.id.widget_frame); final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class); preference.setOnPreferenceChangeListener(listener); preference.onBindViewHolder(holder); @@ -134,9 +128,9 @@ public class MasterSwitchPreferenceTest { @Test public void setDisabledByAdmin_hasEnforcedAdmin_shouldDisableButton() { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); - final PreferenceViewHolder holder = new PreferenceViewHolder( - LayoutInflater.from(mContext).inflate(R.layout.preference_widget_master_switch, null)); - final Switch toggle = (Switch) holder.itemView.findViewById(R.id.switchWidget); + final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) + .inflate(R.layout.preference_widget_master_switch, null)); + final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); toggle.setEnabled(true); preference.onBindViewHolder(holder); @@ -147,9 +141,9 @@ public class MasterSwitchPreferenceTest { @Test public void setDisabledByAdmin_noEnforcedAdmin_shouldEnableButton() { final MasterSwitchPreference preference = new MasterSwitchPreference(mContext); - final PreferenceViewHolder holder = new PreferenceViewHolder( - LayoutInflater.from(mContext).inflate(R.layout.preference_widget_master_switch, null)); - final Switch toggle = (Switch) holder.itemView.findViewById(R.id.switchWidget); + final PreferenceViewHolder holder = new PreferenceViewHolder(LayoutInflater.from(mContext) + .inflate(R.layout.preference_widget_master_switch, null)); + final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget); toggle.setEnabled(false); preference.onBindViewHolder(holder);