Revert "Add divider line in Preference for scan QR code button and share hotspot button"
This reverts commit 890f3a4340
.
Reason for revert: I find a UI defect in this fix.
Change-Id: Icdbb1d2b5319636b8c4c54bcdc0fc3562585a15a
This commit is contained in:
@@ -39,7 +39,6 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
|
||||
|
||||
private ImageButton mImageButton;
|
||||
private Drawable mButtonIcon;
|
||||
private View mDivider;
|
||||
private View.OnClickListener mClickListener;
|
||||
private boolean mVisible;
|
||||
|
||||
@@ -69,8 +68,6 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
|
||||
}
|
||||
|
||||
private void initialize() {
|
||||
// TODO(b/129019971): use methods of divider line in parent object
|
||||
setLayoutResource(R.layout.preference);
|
||||
setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
|
||||
}
|
||||
|
||||
@@ -85,17 +82,13 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
|
||||
getContext().getString(R.string.wifi_dpp_share_hotspot));
|
||||
setButtonIcon(R.drawable.ic_qrcode_24dp);
|
||||
mImageButton.setImageDrawable(mButtonIcon);
|
||||
|
||||
mDivider = holder.findViewById(R.id.two_target_divider);
|
||||
}
|
||||
|
||||
if (mVisible) {
|
||||
mImageButton.setOnClickListener(mClickListener);
|
||||
mImageButton.setVisibility(View.VISIBLE);
|
||||
mDivider.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
mImageButton.setVisibility(View.GONE);
|
||||
mDivider.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user