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

Merge "Fixed an issue with back key behavior" into mnc-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2015-04-30 22:41:13 +00:00
committed by Android (Google) Code Review
parent 05a0336bde 5654815695
commit 729aa93255
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -125,11 +125,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
}
public void clearPinnedHeaderView() {
mPinnedHeaderFrameLayout.removeAllViews();
mPinnedHeaderFrameLayout.setVisibility(View.GONE);
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

17
src/com/android/settings/users/RestrictedProfileSettings.java
View File

@@ -23,6 +23,7 @@ import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
@@ -57,15 +58,13 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment
@Override
public void onActivityCreated(Bundle savedInstanceState) {
if (mHeaderView == null) {
mHeaderView = setPinnedHeaderView(R.layout.user_info_header);
mHeaderView.setOnClickListener(this);
mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
mDeleteButton = (ImageView) mHeaderView.findViewById(R.id.delete);
mDeleteButton.setOnClickListener(this);
getListView().setFastScrollEnabled(true);
}
mHeaderView = setPinnedHeaderView(R.layout.user_info_header);
mHeaderView.setOnClickListener(this);
mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
mDeleteButton = (ImageView) mHeaderView.findViewById(R.id.delete);
mDeleteButton.setOnClickListener(this);
getListView().setFastScrollEnabled(true);
// This is going to bind the preferences.
super.onActivityCreated(savedInstanceState);
}