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

Remove the second target for ConnectedApPreference

Browse Source 
Also create new gear layout since previous one has its own
ripple, which conflicts the normal preference ripple.

Fixes: 72528535
Fixes: 72442172
Test: Screenshot | RunSettingsRoboTests

Change-Id: I6a253574d0a5c971104c157584d66c3312764a26
This commit is contained in:
jackqdyulei
2018-01-26 15:14:58 -08:00
parent bf055d8095
commit a2b151efbe
4 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/wifi/ConnectedAccessPointPreference.java
View File

@@ -36,6 +36,7 @@ public class ConnectedAccessPointPreference extends AccessPointPreference implem
public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks) {
super(accessPoint, context, cache, iconResId, forSavedNetworks);
setWidgetLayoutResource(R.layout.preference_widget_gear_no_bg);
}
public void setOnGearClickListener(OnGearClickListener l) {
@@ -43,26 +44,6 @@ public class ConnectedAccessPointPreference extends AccessPointPreference implem
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);
final View gear = holder.findViewById(R.id.settings_button);
if (gear != null) {
gear.setOnClickListener(this);
}
setDividerVisibility(holder, View.VISIBLE);
}
@Override
public void onClick(View v) {
if (v.getId() == R.id.settings_button) {