Snap for 8073075 from a4da2c2121 to tm-release
Change-Id: Ida728466f677a526dfa8b31fcf9c89011ee809b7
This commit is contained in:
@@ -1423,8 +1423,7 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".datausage.AppDataUsageActivity"
|
android:name=".datausage.AppDataUsageActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:noHistory="true"
|
android:noHistory="true">
|
||||||
android:permission="android.permission.QUERY_ALL_PACKAGES">
|
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
|
<action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
@@ -1494,7 +1493,6 @@
|
|||||||
<activity-alias android:name=".applications.InstalledAppDetails"
|
<activity-alias android:name=".applications.InstalledAppDetails"
|
||||||
android:label="@string/application_info_label"
|
android:label="@string/application_info_label"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:permission="android.permission.QUERY_ALL_PACKAGES"
|
|
||||||
android:targetActivity=".applications.InstalledAppDetailsTop">
|
android:targetActivity=".applications.InstalledAppDetailsTop">
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
|
<action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
|
||||||
@@ -1506,8 +1504,7 @@
|
|||||||
|
|
||||||
<activity android:name=".applications.InstalledAppOpenByDefaultActivity"
|
<activity android:name=".applications.InstalledAppOpenByDefaultActivity"
|
||||||
android:label="@string/application_info_label"
|
android:label="@string/application_info_label"
|
||||||
android:exported="true"
|
android:exported="true">
|
||||||
android:permission="android.permission.QUERY_ALL_PACKAGES">
|
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.APP_OPEN_BY_DEFAULT_SETTINGS" />
|
<action android:name="android.settings.APP_OPEN_BY_DEFAULT_SETTINGS" />
|
||||||
<!-- Also catch legacy "com." prefixed action. -->
|
<!-- Also catch legacy "com." prefixed action. -->
|
||||||
@@ -1864,8 +1861,7 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name="Settings$AppUsageAccessSettingsActivity"
|
android:name="Settings$AppUsageAccessSettingsActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:label="@string/usage_access_title"
|
android:label="@string/usage_access_title">
|
||||||
android:permission="android.permission.QUERY_ALL_PACKAGES">
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.settings.USAGE_ACCESS_SETTINGS"/>
|
<action android:name="android.settings.USAGE_ACCESS_SETTINGS"/>
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
<category android:name="android.intent.category.DEFAULT"/>
|
||||||
|
|||||||
Binary file not shown.
@@ -560,4 +560,7 @@
|
|||||||
|
|
||||||
<!-- Whether to aggregate for network selection list-->
|
<!-- Whether to aggregate for network selection list-->
|
||||||
<bool name="config_network_selection_list_aggregation_enabled">false</bool>
|
<bool name="config_network_selection_list_aggregation_enabled">false</bool>
|
||||||
|
|
||||||
|
<!-- Whether to give option to add restricted profiles -->
|
||||||
|
<bool name="config_offer_restricted_profiles">false</bool>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -13366,7 +13366,7 @@
|
|||||||
<string name="lockscreen_privacy_wallet_summary">Allow access to wallet from lock screen and quick settings</string>
|
<string name="lockscreen_privacy_wallet_summary">Allow access to wallet from lock screen and quick settings</string>
|
||||||
|
|
||||||
<!-- QR Code Scanner toggle name [CHAR LIMIT=60] -->
|
<!-- QR Code Scanner toggle name [CHAR LIMIT=60] -->
|
||||||
<string name="lockscreen_privacy_qr_code_scanner_setting_toggle">Show QR Scanner</string>
|
<string name="lockscreen_privacy_qr_code_scanner_setting_toggle">Show QR scanner</string>
|
||||||
<!-- QR Code Scanner summary [CHAR LIMIT=NONE] -->
|
<!-- QR Code Scanner summary [CHAR LIMIT=NONE] -->
|
||||||
<string name="lockscreen_privacy_qr_code_scanner_summary">Allow access to QR scanner from lock screen</string>
|
<string name="lockscreen_privacy_qr_code_scanner_summary">Allow access to QR scanner from lock screen</string>
|
||||||
|
|
||||||
@@ -13549,6 +13549,8 @@
|
|||||||
<string name="mobile_data_disable_message">You won\’t have access to data or the internet through <xliff:g id="carrier" example="T-Mobile">%s</xliff:g>. Internet will only be available via Wi\u2011Fi.</string>
|
<string name="mobile_data_disable_message">You won\’t have access to data or the internet through <xliff:g id="carrier" example="T-Mobile">%s</xliff:g>. Internet will only be available via Wi\u2011Fi.</string>
|
||||||
<!-- Text used to refer to the user's current carrier in mobile_data_disable_message if the users's mobile network carrier name is not available [CHAR LIMIT=NONE] -->
|
<!-- Text used to refer to the user's current carrier in mobile_data_disable_message if the users's mobile network carrier name is not available [CHAR LIMIT=NONE] -->
|
||||||
<string name="mobile_data_disable_message_default_carrier">your carrier</string>
|
<string name="mobile_data_disable_message_default_carrier">your carrier</string>
|
||||||
|
<!-- Summary for enterprise restriction not allow to use [CHAR LIMIT=NONE] -->
|
||||||
|
<string name="not_allowed_by_ent">Not allowed by your organization</string>
|
||||||
|
|
||||||
<!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
|
<!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
|
||||||
<string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
|
<string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
|
||||||
|
|||||||
@@ -16,10 +16,7 @@
|
|||||||
|
|
||||||
package com.android.settings.activityembedding;
|
package com.android.settings.activityembedding;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.ActivityTaskManager;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.Rect;
|
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
import android.util.FeatureFlagUtils;
|
import android.util.FeatureFlagUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@@ -65,13 +62,4 @@ public class ActivityEmbeddingUtils {
|
|||||||
|
|
||||||
return isFlagEnabled && isSplitSupported;
|
return isFlagEnabled && isSplitSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether the screen meets two-pane resolution. */
|
|
||||||
public static boolean isTwoPaneResolution(Activity activity) {
|
|
||||||
final Rect currentTaskBounds =
|
|
||||||
ActivityTaskManager.getInstance().getTaskBounds(activity.getTaskId());
|
|
||||||
|
|
||||||
return currentTaskBounds.width() >= getMinCurrentScreenSplitWidthPx(activity)
|
|
||||||
&& currentTaskBounds.height() >= getMinSmallestScreenSplitWidthPx(activity);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ import androidx.fragment.app.Fragment;
|
|||||||
import androidx.fragment.app.FragmentActivity;
|
import androidx.fragment.app.FragmentActivity;
|
||||||
import androidx.fragment.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
import androidx.fragment.app.FragmentTransaction;
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
|
import androidx.window.embedding.SplitController;
|
||||||
import androidx.window.embedding.SplitRule;
|
import androidx.window.embedding.SplitRule;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
@@ -85,8 +86,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
private View mTwoPaneSuggestionView;
|
private View mTwoPaneSuggestionView;
|
||||||
private CategoryMixin mCategoryMixin;
|
private CategoryMixin mCategoryMixin;
|
||||||
private Set<HomepageLoadedListener> mLoadedListeners;
|
private Set<HomepageLoadedListener> mLoadedListeners;
|
||||||
|
private SplitController mSplitController;
|
||||||
private boolean mIsEmbeddingActivityEnabled;
|
private boolean mIsEmbeddingActivityEnabled;
|
||||||
private boolean mIsTwoPaneLastTime;
|
private boolean mIsTwoPane;
|
||||||
|
|
||||||
/** A listener receiving homepage loaded events. */
|
/** A listener receiving homepage loaded events. */
|
||||||
public interface HomepageLoadedListener {
|
public interface HomepageLoadedListener {
|
||||||
@@ -149,7 +151,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.settings_homepage_container);
|
setContentView(R.layout.settings_homepage_container);
|
||||||
mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
|
mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
|
||||||
mIsTwoPaneLastTime = ActivityEmbeddingUtils.isTwoPaneResolution(this);
|
mSplitController = SplitController.getInstance();
|
||||||
|
mIsTwoPane = mSplitController.isActivityEmbedded(this);
|
||||||
|
|
||||||
final View appBar = findViewById(R.id.app_bar_container);
|
final View appBar = findViewById(R.id.app_bar_container);
|
||||||
appBar.setMinimumHeight(getSearchBoxHeight());
|
appBar.setMinimumHeight(getSearchBoxHeight());
|
||||||
@@ -213,9 +216,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
@Override
|
@Override
|
||||||
public void onConfigurationChanged(Configuration newConfig) {
|
public void onConfigurationChanged(Configuration newConfig) {
|
||||||
super.onConfigurationChanged(newConfig);
|
super.onConfigurationChanged(newConfig);
|
||||||
final boolean isTwoPane = ActivityEmbeddingUtils.isTwoPaneResolution(this);
|
final boolean newTwoPaneState = mSplitController.isActivityEmbedded(this);
|
||||||
if (mIsTwoPaneLastTime != isTwoPane) {
|
if (mIsTwoPane != newTwoPaneState) {
|
||||||
mIsTwoPaneLastTime = isTwoPane;
|
mIsTwoPane = newTwoPaneState;
|
||||||
updateHomepageAppBar();
|
updateHomepageAppBar();
|
||||||
updateHomepageBackground();
|
updateHomepageBackground();
|
||||||
}
|
}
|
||||||
@@ -254,7 +257,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Window window = getWindow();
|
final Window window = getWindow();
|
||||||
final int color = ActivityEmbeddingUtils.isTwoPaneResolution(this)
|
final int color = mIsTwoPane
|
||||||
? Utils.getColorAttrDefaultColor(this, com.android.internal.R.attr.colorSurface)
|
? Utils.getColorAttrDefaultColor(this, com.android.internal.R.attr.colorSurface)
|
||||||
: Utils.getColorAttrDefaultColor(this, android.R.attr.colorBackground);
|
: Utils.getColorAttrDefaultColor(this, android.R.attr.colorBackground);
|
||||||
|
|
||||||
@@ -416,7 +419,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
if (!mIsEmbeddingActivityEnabled) {
|
if (!mIsEmbeddingActivityEnabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (ActivityEmbeddingUtils.isTwoPaneResolution(this)) {
|
if (mIsTwoPane) {
|
||||||
findViewById(R.id.homepage_app_bar_regular_phone_view).setVisibility(View.GONE);
|
findViewById(R.id.homepage_app_bar_regular_phone_view).setVisibility(View.GONE);
|
||||||
findViewById(R.id.homepage_app_bar_two_pane_view).setVisibility(View.VISIBLE);
|
findViewById(R.id.homepage_app_bar_two_pane_view).setVisibility(View.VISIBLE);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ import androidx.preference.Preference;
|
|||||||
import androidx.preference.PreferenceFragmentCompat;
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import androidx.window.embedding.SplitController;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.Utils;
|
import com.android.settings.Utils;
|
||||||
@@ -144,7 +145,7 @@ public class TopLevelSettings extends DashboardFragment implements
|
|||||||
if (mFirstStarted) {
|
if (mFirstStarted) {
|
||||||
mFirstStarted = false;
|
mFirstStarted = false;
|
||||||
} else if (mIsEmbeddingActivityEnabled && isOnlyOneActivityInTask()
|
} else if (mIsEmbeddingActivityEnabled && isOnlyOneActivityInTask()
|
||||||
&& !ActivityEmbeddingUtils.isTwoPaneResolution(getActivity())) {
|
&& !SplitController.getInstance().isActivityEmbedded(getActivity())) {
|
||||||
// Set default highlight menu key for 1-pane homepage since it will show the placeholder
|
// Set default highlight menu key for 1-pane homepage since it will show the placeholder
|
||||||
// page once changing back to 2-pane.
|
// page once changing back to 2-pane.
|
||||||
Log.i(TAG, "Set default menu key");
|
Log.i(TAG, "Set default menu key");
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import android.content.Context;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.android.settings.notification.LockScreenNotificationPreferenceController;
|
import com.android.settings.notification.LockScreenNotificationPreferenceController;
|
||||||
|
import com.android.settings.safetycenter.SafetyCenterStatus;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settingslib.core.AbstractPreferenceController;
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
@@ -89,5 +90,10 @@ public class PrivacyDashboardFragment extends DashboardFragment {
|
|||||||
Context context) {
|
Context context) {
|
||||||
return buildPreferenceControllers(context, null);
|
return buildPreferenceControllers(context, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isPageSearchEnabled(Context context) {
|
||||||
|
return !SafetyCenterStatus.isEnabled();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import android.os.UserHandle;
|
|||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
import com.android.settings.Utils;
|
import com.android.settings.Utils;
|
||||||
import com.android.settingslib.RestrictedLockUtils;
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||||
@@ -30,7 +31,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
|
|||||||
public class UserCapabilities {
|
public class UserCapabilities {
|
||||||
boolean mEnabled = true;
|
boolean mEnabled = true;
|
||||||
boolean mCanAddUser = true;
|
boolean mCanAddUser = true;
|
||||||
boolean mCanAddRestrictedProfile = true;
|
boolean mCanAddRestrictedProfile;
|
||||||
boolean mIsAdmin;
|
boolean mIsAdmin;
|
||||||
boolean mIsGuest;
|
boolean mIsGuest;
|
||||||
boolean mUserSwitcherEnabled;
|
boolean mUserSwitcherEnabled;
|
||||||
@@ -57,12 +58,13 @@ public class UserCapabilities {
|
|||||||
caps.mIsAdmin = myUserInfo.isAdmin();
|
caps.mIsAdmin = myUserInfo.isAdmin();
|
||||||
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
|
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
|
||||||
Context.DEVICE_POLICY_SERVICE);
|
Context.DEVICE_POLICY_SERVICE);
|
||||||
// No restricted profiles for tablets with a device owner, or phones.
|
|
||||||
if (dpm.isDeviceManaged()
|
boolean offerRestricted =
|
||||||
|| Utils.isVoiceCapable(context)
|
context.getResources().getBoolean(R.bool.config_offer_restricted_profiles);
|
||||||
|| !userManager.isUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED)) {
|
caps.mCanAddRestrictedProfile =
|
||||||
caps.mCanAddRestrictedProfile = false;
|
offerRestricted && !dpm.isDeviceManaged() && userManager.isUserTypeEnabled(
|
||||||
}
|
UserManager.USER_TYPE_FULL_RESTRICTED);
|
||||||
|
|
||||||
caps.updateAddUserCapabilities(context);
|
caps.updateAddUserCapabilities(context);
|
||||||
return caps;
|
return caps;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,10 +31,10 @@ import androidx.preference.PreferenceGroup;
|
|||||||
import androidx.preference.PreferenceGroupAdapter;
|
import androidx.preference.PreferenceGroupAdapter;
|
||||||
import androidx.preference.PreferenceViewHolder;
|
import androidx.preference.PreferenceViewHolder;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import androidx.window.embedding.SplitController;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.Utils;
|
import com.android.settings.Utils;
|
||||||
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
|
|
||||||
import com.android.settings.homepage.SettingsHomepageActivity;
|
import com.android.settings.homepage.SettingsHomepageActivity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -255,6 +255,6 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isHighlightNeeded() {
|
private boolean isHighlightNeeded() {
|
||||||
return ActivityEmbeddingUtils.isTwoPaneResolution(mHomepageActivity);
|
return SplitController.getInstance().isActivityEmbedded(mHomepageActivity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,8 +26,10 @@ import androidx.annotation.DrawableRes;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.PreferenceViewHolder;
|
import androidx.preference.PreferenceViewHolder;
|
||||||
|
|
||||||
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.wifi.dpp.WifiDppUtils;
|
import com.android.settings.wifi.dpp.WifiDppUtils;
|
||||||
|
import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Preference for users to add Wi-Fi networks in WifiSettings
|
* The Preference for users to add Wi-Fi networks in WifiSettings
|
||||||
@@ -37,6 +39,8 @@ public class AddWifiNetworkPreference extends Preference {
|
|||||||
private static final String TAG = "AddWifiNetworkPreference";
|
private static final String TAG = "AddWifiNetworkPreference";
|
||||||
|
|
||||||
private final Drawable mScanIconDrawable;
|
private final Drawable mScanIconDrawable;
|
||||||
|
@VisibleForTesting
|
||||||
|
boolean mIsAddWifiConfigAllow;
|
||||||
|
|
||||||
public AddWifiNetworkPreference(Context context) {
|
public AddWifiNetworkPreference(Context context) {
|
||||||
super(context);
|
super(context);
|
||||||
@@ -47,6 +51,8 @@ public class AddWifiNetworkPreference extends Preference {
|
|||||||
setTitle(R.string.wifi_add_network);
|
setTitle(R.string.wifi_add_network);
|
||||||
|
|
||||||
mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);
|
mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);
|
||||||
|
mIsAddWifiConfigAllow = WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(context);
|
||||||
|
updatePreferenceForRestriction();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -73,4 +79,12 @@ public class AddWifiNetworkPreference extends Preference {
|
|||||||
}
|
}
|
||||||
return buttonIcon;
|
return buttonIcon;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
void updatePreferenceForRestriction() {
|
||||||
|
if (!mIsAddWifiConfigAllow) {
|
||||||
|
setEnabled(false);
|
||||||
|
setSummary(R.string.not_allowed_by_ent);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import androidx.fragment.app.FragmentManager;
|
|||||||
import com.android.internal.annotations.VisibleForTesting;
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
|
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
|
||||||
|
import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* When apps send a new intent with a WifiConfiguration list extra to Settings APP. Settings APP
|
* When apps send a new intent with a WifiConfiguration list extra to Settings APP. Settings APP
|
||||||
@@ -55,6 +56,8 @@ public class AddAppNetworksActivity extends FragmentActivity {
|
|||||||
final Bundle mBundle = new Bundle();
|
final Bundle mBundle = new Bundle();
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
IActivityManager mActivityManager = ActivityManager.getService();
|
IActivityManager mActivityManager = ActivityManager.getService();
|
||||||
|
@VisibleForTesting
|
||||||
|
boolean mIsAddWifiConfigAllow;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||||
@@ -71,6 +74,8 @@ public class AddAppNetworksActivity extends FragmentActivity {
|
|||||||
window.setGravity(Gravity.BOTTOM);
|
window.setGravity(Gravity.BOTTOM);
|
||||||
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
|
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
|
||||||
WindowManager.LayoutParams.WRAP_CONTENT);
|
WindowManager.LayoutParams.WRAP_CONTENT);
|
||||||
|
|
||||||
|
mIsAddWifiConfigAllow = WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -85,6 +90,10 @@ public class AddAppNetworksActivity extends FragmentActivity {
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
protected boolean showAddNetworksFragment() {
|
protected boolean showAddNetworksFragment() {
|
||||||
|
if (!mIsAddWifiConfigAllow) {
|
||||||
|
Log.d(TAG, "Not allowed by Enterprise Restriction");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
String packageName = getCallingAppPackageName();
|
String packageName = getCallingAppPackageName();
|
||||||
if (TextUtils.isEmpty(packageName)) {
|
if (TextUtils.isEmpty(packageName)) {
|
||||||
Log.d(TAG, "Package name is null");
|
Log.d(TAG, "Package name is null");
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
|
|||||||
private final Map<String, List<EnforcingUser>> mRestrictionSources = new HashMap<>();
|
private final Map<String, List<EnforcingUser>> mRestrictionSources = new HashMap<>();
|
||||||
private final List<UserInfo> mUserProfileInfos = new ArrayList<>();
|
private final List<UserInfo> mUserProfileInfos = new ArrayList<>();
|
||||||
private final Set<Integer> mManagedProfiles = new HashSet<>();
|
private final Set<Integer> mManagedProfiles = new HashSet<>();
|
||||||
|
private final Set<String> mEnabledTypes = new HashSet<>();
|
||||||
private boolean mIsQuietModeEnabled = false;
|
private boolean mIsQuietModeEnabled = false;
|
||||||
private int[] profileIdsForUser = new int[0];
|
private int[] profileIdsForUser = new int[0];
|
||||||
private boolean mUserSwitchEnabled;
|
private boolean mUserSwitchEnabled;
|
||||||
@@ -105,6 +106,11 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
|
|||||||
mGuestRestrictions.add(restriction);
|
mGuestRestrictions.add(restriction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Implementation
|
||||||
|
protected boolean hasUserRestriction(String restrictionKey) {
|
||||||
|
return hasUserRestriction(restrictionKey, UserHandle.of(UserHandle.myUserId()));
|
||||||
|
}
|
||||||
|
|
||||||
public static ShadowUserManager getShadow() {
|
public static ShadowUserManager getShadow() {
|
||||||
return (ShadowUserManager) Shadow.extract(
|
return (ShadowUserManager) Shadow.extract(
|
||||||
RuntimeEnvironment.application.getSystemService(UserManager.class));
|
RuntimeEnvironment.application.getSystemService(UserManager.class));
|
||||||
@@ -199,4 +205,17 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
|
|||||||
public void setSwitchabilityStatus(@UserManager.UserSwitchabilityResult int newStatus) {
|
public void setSwitchabilityStatus(@UserManager.UserSwitchabilityResult int newStatus) {
|
||||||
mSwitchabilityStatus = newStatus;
|
mSwitchabilityStatus = newStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Implementation
|
||||||
|
protected boolean isUserTypeEnabled(String userType) {
|
||||||
|
return mEnabledTypes.contains(userType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserTypeEnabled(String type, boolean enabled) {
|
||||||
|
if (enabled) {
|
||||||
|
mEnabledTypes.add(type);
|
||||||
|
} else {
|
||||||
|
mEnabledTypes.remove(type);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,12 +18,17 @@ package com.android.settings.users;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.content.ComponentName;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
|
||||||
import com.android.settings.testutils.shadow.ShadowUserManager;
|
import com.android.settings.testutils.shadow.ShadowUserManager;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
@@ -32,16 +37,24 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
import org.robolectric.annotation.Config;
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = {ShadowUserManager.class})
|
@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class,
|
||||||
|
SettingsShadowResources.class})
|
||||||
public class UserCapabilitiesTest {
|
public class UserCapabilitiesTest {
|
||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private ShadowUserManager mUserManager;
|
private ShadowUserManager mUserManager;
|
||||||
|
private ShadowDevicePolicyManager mDpm;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
mContext = RuntimeEnvironment.application;
|
mContext = RuntimeEnvironment.application;
|
||||||
mUserManager = ShadowUserManager.getShadow();
|
mUserManager = ShadowUserManager.getShadow();
|
||||||
|
mDpm = ShadowDevicePolicyManager.getShadow();
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
SettingsShadowResources.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -85,4 +98,40 @@ public class UserCapabilitiesTest {
|
|||||||
|
|
||||||
assertThat(userCapabilities.mUserSwitcherEnabled).isTrue();
|
assertThat(userCapabilities.mUserSwitcherEnabled).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void restrictedProfile_enabled() {
|
||||||
|
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, true);
|
||||||
|
mDpm.setDeviceOwner(null);
|
||||||
|
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, true);
|
||||||
|
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
|
||||||
|
assertThat(userCapabilities.mCanAddRestrictedProfile).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void restrictedProfile_configNotSet() {
|
||||||
|
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, true);
|
||||||
|
mDpm.setDeviceOwner(null);
|
||||||
|
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, false);
|
||||||
|
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
|
||||||
|
assertThat(userCapabilities.mCanAddRestrictedProfile).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void restrictedProfile_deviceIsManaged() {
|
||||||
|
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, true);
|
||||||
|
mDpm.setDeviceOwner(new ComponentName("test", "test"));
|
||||||
|
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, true);
|
||||||
|
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
|
||||||
|
assertThat(userCapabilities.mCanAddRestrictedProfile).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void restrictedProfile_typeNotEnabled() {
|
||||||
|
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, false);
|
||||||
|
mDpm.setDeviceOwner(null);
|
||||||
|
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, true);
|
||||||
|
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
|
||||||
|
assertThat(userCapabilities.mCanAddRestrictedProfile).isFalse();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package com.android.settings.wifi;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.UserManager;
|
||||||
|
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class AddWifiNetworkPreferenceTest {
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private AddWifiNetworkPreference mPreference;
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private UserManager mUserManager;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
|
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||||
|
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
|
||||||
|
mPreference = new AddWifiNetworkPreference(mContext);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updatePreferenceForRestriction_isAddWifiConfigAllowed_prefIsEnabled() {
|
||||||
|
mPreference.mIsAddWifiConfigAllow = true;
|
||||||
|
|
||||||
|
mPreference.updatePreferenceForRestriction();
|
||||||
|
|
||||||
|
assertThat(mPreference.isEnabled()).isTrue();
|
||||||
|
assertThat(mPreference.getSummary()).isNull();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updatePreferenceForRestriction_isAddWifiConfigNotAllowed_prefIsDisabled() {
|
||||||
|
mPreference.mIsAddWifiConfigAllow = false;
|
||||||
|
|
||||||
|
mPreference.updatePreferenceForRestriction();
|
||||||
|
|
||||||
|
assertThat(mPreference.isEnabled()).isFalse();
|
||||||
|
assertThat(mPreference.getSummary())
|
||||||
|
.isEqualTo(mContext.getString(R.string.not_allowed_by_ent));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,6 +47,7 @@ public class AddAppNetworksActivityTest {
|
|||||||
|
|
||||||
mActivity = Robolectric.buildActivity(AddAppNetworksActivity.class).create().get();
|
mActivity = Robolectric.buildActivity(AddAppNetworksActivity.class).create().get();
|
||||||
mActivity.mActivityManager = mIActivityManager;
|
mActivity.mActivityManager = mIActivityManager;
|
||||||
|
mActivity.mIsAddWifiConfigAllow = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -77,6 +78,13 @@ public class AddAppNetworksActivityTest {
|
|||||||
assertThat(mActivity.showAddNetworksFragment()).isTrue();
|
assertThat(mActivity.showAddNetworksFragment()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void showAddNetworksFragment_isAddWifiConfigNotAllow_returnFalse() {
|
||||||
|
mActivity.mIsAddWifiConfigAllow = false;
|
||||||
|
|
||||||
|
assertThat(mActivity.showAddNetworksFragment()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
private void fakeCallingPackage(@Nullable String packageName) {
|
private void fakeCallingPackage(@Nullable String packageName) {
|
||||||
try {
|
try {
|
||||||
when(mIActivityManager.getLaunchedFromPackage(any())).thenReturn(packageName);
|
when(mIActivityManager.getLaunchedFromPackage(any())).thenReturn(packageName);
|
||||||
|
|||||||
Reference in New Issue
Block a user