Merge "Revert "Workaround Wi-Fi Settings NullPointerException""
This commit is contained in:
committed by
Android (Google) Code Review
commit
f6390d7924
@@ -177,19 +177,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
|
||||
}
|
||||
|
||||
public void setPinnedHeaderView(View pinnedHeader) {
|
||||
if (mPinnedHeaderFrameLayout == null) {
|
||||
Log.e(TAG, "setPinnedHeaderView: null layout");
|
||||
return;
|
||||
}
|
||||
mPinnedHeaderFrameLayout.addView(pinnedHeader);
|
||||
mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
public void showPinnedHeader(boolean show) {
|
||||
if (mPinnedHeaderFrameLayout == null) {
|
||||
Log.e(TAG, "showPinnedHeader: null layout");
|
||||
return;
|
||||
}
|
||||
mPinnedHeaderFrameLayout.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user