summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/users
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-04-30 17:53:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 17:53:20 +0000
commite0bf739ddf8781024578a879fa94bb5e6a71303b (patch)
tree57061a249dcb12e536f56e58d1e49235e6408290 /src/com/android/settings/users
parent48b1884a4ae458b5861b4a063d723ed60edd157c (diff)
parent28c3f6bb71da1727fdc39bdc622518b1daeb3b0a (diff)
downloadpackages_apps_Settings-e0bf739ddf8781024578a879fa94bb5e6a71303b.zip
packages_apps_Settings-e0bf739ddf8781024578a879fa94bb5e6a71303b.tar.gz
packages_apps_Settings-e0bf739ddf8781024578a879fa94bb5e6a71303b.tar.bz2
Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r--src/com/android/settings/users/RestrictedProfileSettings.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index 03a55d4..7b698cf 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -22,7 +22,6 @@ import android.content.Intent;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@@ -59,9 +58,7 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment
@Override
public void onActivityCreated(Bundle savedInstanceState) {
if (mHeaderView == null) {
- mHeaderView = LayoutInflater.from(getActivity()).inflate(
- R.layout.user_info_header, null);
- setPinnedHeaderView(mHeaderView);
+ 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);