PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Override performClick method to eliminate redundant click

Browse Source 
Bug: 132226328
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SwitchBar
Change-Id: I22987a7695dfc84e50d6419604a9512f98cf4d13
This commit is contained in:
Kevin Chang
2019-05-08 18:49:27 +08:00
parent caa17e0ec7
commit d3496412f7
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/widget/SwitchBar.java
View File

@@ -21,7 +21,6 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -112,8 +111,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
// Set the whole SwitchBar focusable and clickable. // Set the whole SwitchBar focusable and clickable.
setFocusable(true); setFocusable(true);
setClickable(true); setClickable(true);
// Set a onClickListener to handle the functionality of ToggleSwitch.
setOnClickListener((View v) -> getDelegatingView().performClick());
final TypedArray a = context.obtainStyledAttributes(attrs, XML_ATTRIBUTES); final TypedArray a = context.obtainStyledAttributes(attrs, XML_ATTRIBUTES);
final int switchBarMarginStart = (int) a.getDimension(0, 0); final int switchBarMarginStart = (int) a.getDimension(0, 0);
@@ -170,6 +167,12 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
} }
// Override the performClick method to eliminate redundant click.
@Override
public boolean performClick() {
return getDelegatingView().performClick();
}
public void setMetricsTag(String tag) { public void setMetricsTag(String tag) {
mMetricsTag = tag; mMetricsTag = tag;
} }

7
tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
View File

@@ -95,4 +95,11 @@ public class SwitchBarTest {
mBar.setDisabledByAdmin(null); mBar.setDisabledByAdmin(null);
assertThat(mBar.getDelegatingView().getId()).isEqualTo(R.id.switch_widget); assertThat(mBar.getDelegatingView().getId()).isEqualTo(R.id.switch_widget);
} }
@Test
public void performClick_shouldIsCheckedValueChange() {
boolean isChecked = mBar.isChecked();
mBar.performClick();
assertThat(mBar.isChecked()).isEqualTo(!isChecked);
}
} }