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

am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev

Browse Source 
* commit '9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
  Code clean-ups following moving the managed profile under accounts
This commit is contained in:
Alexandra Gherghina
2014-09-04 09:36:20 +00:00
committed by Android Git Automerger
parent b448ea3a33 9dce0791f8
commit c24310c963
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -31,9 +31,6 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@@ -117,6 +114,7 @@ public class AccountSettings extends SettingsPreferenceFragment
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mUm = (UserManager) getSystemService(Context.USER_SERVICE); mUm = (UserManager) getSystemService(Context.USER_SERVICE);
mProfileNotAvailablePreference = new Preference(getActivity());
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@@ -335,16 +333,11 @@ public class AccountSettings extends SettingsPreferenceFragment
} }
} else { } else {
// Put a label instead of the accounts list // Put a label instead of the accounts list
synchronized (this) { mProfileNotAvailablePreference.setEnabled(false);
if (mProfileNotAvailablePreference == null) { mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);
mProfileNotAvailablePreference = new Preference(getActivity()); mProfileNotAvailablePreference.setTitle(null);
mProfileNotAvailablePreference.setEnabled(false); mProfileNotAvailablePreference.setSummary(
mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon); R.string.managed_profile_not_available_label);
mProfileNotAvailablePreference.setTitle(null);
mProfileNotAvailablePreference.setSummary(
R.string.managed_profile_not_available_label);
}
}
profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference); profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);
} }
if (profileData.removeWorkProfilePreference != null) { if (profileData.removeWorkProfilePreference != null) {