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

Merge "Add divider line in Preference for scan QR code button and share hotspot button"

Browse Source
This commit is contained in:
Arc Wang
2019-03-26 01:36:26 +00:00
committed by Android (Google) Code Review
parent d8665574d5 25595994b7
commit 200fe62814
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/AddWifiNetworkPreference.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.ImageButton; import android.widget.ImageButton;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
@@ -63,10 +62,6 @@ public class AddWifiNetworkPreference extends Preference {
getContext().startActivity( getContext().startActivity(
WifiDppUtils.getEnrolleeQrCodeScannerIntent(/* ssid */ null)); WifiDppUtils.getEnrolleeQrCodeScannerIntent(/* ssid */ null));
}); });
final View divider = (View) holder.findViewById(
com.android.settingslib.R.id.two_target_divider);
divider.setVisibility(View.INVISIBLE);
} }
} }

7
src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
View File

@@ -39,6 +39,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
private ImageButton mImageButton; private ImageButton mImageButton;
private Drawable mButtonIcon; private Drawable mButtonIcon;
private View mDivider;
private View.OnClickListener mClickListener; private View.OnClickListener mClickListener;
private boolean mVisible; private boolean mVisible;
@@ -68,6 +69,8 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
} }
private void initialize() { private void initialize() {
// TODO(b/129019971): use methods of divider line in parent object
setLayoutResource(com.android.settingslib.R.layout.preference_two_target);
setWidgetLayoutResource(R.layout.wifi_button_preference_widget); setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
} }
@@ -82,13 +85,17 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
getContext().getString(R.string.wifi_dpp_share_hotspot)); getContext().getString(R.string.wifi_dpp_share_hotspot));
setButtonIcon(R.drawable.ic_qrcode_24dp); setButtonIcon(R.drawable.ic_qrcode_24dp);
mImageButton.setImageDrawable(mButtonIcon); mImageButton.setImageDrawable(mButtonIcon);
mDivider = holder.findViewById(R.id.two_target_divider);
} }
if (mVisible) { if (mVisible) {
mImageButton.setOnClickListener(mClickListener); mImageButton.setOnClickListener(mClickListener);
mImageButton.setVisibility(View.VISIBLE); mImageButton.setVisibility(View.VISIBLE);
mDivider.setVisibility(View.VISIBLE);
} else { } else {
mImageButton.setVisibility(View.GONE); mImageButton.setVisibility(View.GONE);
mDivider.setVisibility(View.GONE);
} }
} }