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

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

Browse Source 
This reverts commit 890f3a4340.

Reason for revert: I find a UI defect in this fix.

Change-Id: Icdbb1d2b5319636b8c4c54bcdc0fc3562585a15a
This commit is contained in:
Arc Wang
2019-03-22 05:36:59 +00:00
parent 890f3a4340
commit 8040f4c59f
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/preference.xml
View File

@@ -54,10 +54,6 @@
</RelativeLayout> </RelativeLayout>
<include
layout="@layout/preference_two_target_divider"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@android:id/widget_frame" android:id="@android:id/widget_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@@ -20,6 +20,7 @@ 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;
@@ -62,6 +63,10 @@ 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,7 +39,6 @@ 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;
@@ -69,8 +68,6 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
} }
private void initialize() { 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); setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
} }
@@ -85,17 +82,13 @@ 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);
} }
} }