Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dce0791 authored by Alexandra Gherghina's avatar Alexandra Gherghina Committed by Android (Google) Code Review
Browse files

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

parents 7641e1ad e529bb98

src/com/android/settings/accounts/AccountSettings.java

+6 −13
Original line number Original line Diff line number Diff line
@@ -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) {

                if (mProfileNotAvailablePreference == null) {

                    mProfileNotAvailablePreference = new Preference(getActivity());

            mProfileNotAvailablePreference.setEnabled(false);

            mProfileNotAvailablePreference.setEnabled(false);

            mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);

            mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);

            mProfileNotAvailablePreference.setTitle(null);

            mProfileNotAvailablePreference.setTitle(null);

            mProfileNotAvailablePreference.setSummary(

            mProfileNotAvailablePreference.setSummary(

                    R.string.managed_profile_not_available_label);

                    R.string.managed_profile_not_available_label);

                }

            }

            profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);

            profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);

        }

        }

        if (profileData.removeWorkProfilePreference != null) {

        if (profileData.removeWorkProfilePreference != null) {