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

Add disabled by policy empty views to more screens.

Browse Source 
Bug: 27588316
Bug: 27588671
Bug: 27588740
Change-Id: Id614067d76e936e9c3c585fdaed304bfbc88dc74
This commit is contained in:
Sudheer Shanka
2016-03-14 12:03:40 -07:00
parent e0a235cf07
commit f1e78d35dc
4 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -20,6 +20,7 @@ import android.app.ActionBar;
import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -33,7 +34,11 @@ import com.android.settings.HelpUtils;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.ShowAdminSupportDetailsDialog;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedLockUtils;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
public class AndroidBeam extends InstrumentedFragment
implements SwitchBar.OnSwitchChangeListener {
@@ -41,7 +46,8 @@ public class AndroidBeam extends InstrumentedFragment
private NfcAdapter mNfcAdapter;
private SwitchBar mSwitchBar;
private CharSequence mOldActivityTitle;
private boolean mBeamDisallowed;
private boolean mBeamDisallowedByBase;
private boolean mBeamDisallowedByAdmin;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -53,8 +59,6 @@ public class AndroidBeam extends InstrumentedFragment
actionBar.setTitle(R.string.android_beam_settings_title);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
mBeamDisallowed = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
.hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
setHasOptionsMenu(true);
}
@@ -68,8 +72,19 @@ public class AndroidBeam extends InstrumentedFragment
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
final UserManager um = UserManager.get(getActivity());
mBeamDisallowedByBase = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
if (!mBeamDisallowedByBase && admin != null) {
View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
view.setVisibility(View.VISIBLE);
mBeamDisallowedByAdmin = true;
return view;
}
mView = inflater.inflate(R.layout.android_beam, container, false);
return mView;
}
@@ -80,10 +95,14 @@ public class AndroidBeam extends InstrumentedFragment
SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
mSwitchBar.setChecked(!mBeamDisallowed && mNfcAdapter.isNdefPushEnabled());
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.setEnabled(!mBeamDisallowed);
mSwitchBar.show();
if (!mBeamDisallowedByBase && mBeamDisallowedByAdmin) {
mSwitchBar.hide();
} else {
mSwitchBar.setChecked(!mBeamDisallowedByBase && mNfcAdapter.isNdefPushEnabled());
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.setEnabled(!mBeamDisallowedByBase);
mSwitchBar.show();
}
}
@Override