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

Merge "Correctly restrict UI for WifiSettings in Guest profile."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-15 21:36:54 +00:00
committed by Android (Google) Code Review
parent efce44927e 8fc61244ef
commit 6e6383026c
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/LinkablePreference.java
View File

@@ -55,11 +55,15 @@ public class LinkablePreference extends Preference {
super.onBindViewHolder(view);
TextView textView = (TextView) view.findViewById(android.R.id.title);
if (textView == null || mContentTitle == null || mClickListener == null) {
if (textView == null) {
return;
}
textView.setSingleLine(false);
if (mContentTitle == null || mClickListener == null) {
return;
}
textView.setSingleLine(false);
StringBuilder contentBuilder = new StringBuilder().append(mContentTitle);
if (mContentDescription != null) {
contentBuilder.append("\n\n");

10
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -179,9 +179,11 @@ public class WifiSettings extends RestrictedSettingsFragment
super.onViewCreated(view, savedInstanceState);
final Activity activity = getActivity();
if (activity != null) {
if (!isUiRestricted()) {
mProgressHeader = (ProgressBar) setPinnedHeaderView(R.layout.wifi_progress_header);
}
}
}
@Override
public void onCreate(Bundle icicle) {
@@ -201,6 +203,10 @@ public class WifiSettings extends RestrictedSettingsFragment
mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
if (isUiRestricted()) {
getPreferenceScreen().removePreference(mAdditionalSettingsPreferenceCategory);
}
Context prefContext = getPrefContext();
mAddPreference = new Preference(prefContext);
mAddPreference.setIcon(R.drawable.ic_menu_add_inset);
@@ -818,11 +824,11 @@ public class WifiSettings extends RestrictedSettingsFragment
private void setOffMessage() {
if (isUiRestricted()) {
removeConnectedAccessPointPreference();
mAccessPointsPreferenceCategory.removeAll();
if (!isUiRestrictedByOnlyAdmin()) {
addMessagePreference(R.string.wifi_empty_list_user_restricted);
}
removeConnectedAccessPointPreference();
mAccessPointsPreferenceCategory.removeAll();
return;
}