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

Snap for 8498890 from 5d218d9fa4 to tm-release

Browse Source 
Change-Id: I87032fa145db6180878239443832e8f5143238ba
This commit is contained in:
Android Build Coastguard Worker
2022-04-26 01:20:12 +00:00
parent 19b93190ee 5d218d9fa4
commit d2522ba9aa
16 changed files with 167 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidManifest.xml
View File

@@ -1789,6 +1789,18 @@
android:value="true" />
</activity>
<activity android:name="Settings$PrivacyControlsActivity"
android:label="@string/privacy_controls_title"
android:exported="true"
android:icon="@drawable/ic_settings_privacy">
<intent-filter android:priority="1">
<action android:name="android.settings.PRIVACY_CONTROLS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.privacy.PrivacyControlsFragment" />
</activity>
<activity android:name=".development.tare.TareHomePage"
android:label="@string/tare_settings"
android:exported="false" />

3
res/values/styles.xml
View File

@@ -579,6 +579,9 @@
<!-- Padding for indeterminate progress bar -->
<item name="progressBarStartPadding">12dp</item>
<item name="progressBarEndPadding">16dp</item>
<!-- Title icon size -->
<item name="iconSize">25dp</item>
</style>
<style name="SliceRow.Slider.LargeIcon">

1
src/com/android/settings/Settings.java
View File

@@ -224,6 +224,7 @@ public class Settings extends SettingsActivity {
}
}
}
public static class PrivacyControlsActivity extends SettingsActivity { /* empty */ }
public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
public static class FactoryResetActivity extends SettingsActivity {
@Override

6
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -623,6 +623,12 @@ public class AccountPreferenceController extends AbstractPreferenceController
if (action.equals(Intent.ACTION_MANAGED_PROFILE_REMOVED)
|| action.equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) {
if (mFragment instanceof AccountWorkProfileDashboardFragment) {
new SubSettingLauncher(context)
.setDestination(AccountDashboardFragment.class.getName())
.setSourceMetricsCategory(mFragment.getMetricsCategory())
.setTitleRes(-1)
.setIsSecondLayerPage(true)
.launch();
mFragment.getActivity().finish();
} else {
// Clean old state

8
src/com/android/settings/core/SliderPreferenceController.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.core;
import android.content.Context;
import androidx.preference.Preference;
import androidx.slice.builders.SliceAction;
import com.android.settings.slices.SliceData;
@@ -70,4 +71,11 @@ public abstract class SliderPreferenceController extends BasePreferenceControlle
public int getSliceType() {
return SliceData.SliceType.SLIDER;
}
/**
* @return the SliceAction for the end item of the slice.
*/
public SliceAction getSliceEndItem(Context context) {
return null;
}
}

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -152,6 +152,7 @@ import com.android.settings.password.ChooseLockPassword;
import com.android.settings.password.ChooseLockPattern;
import com.android.settings.print.PrintJobSettingsFragment;
import com.android.settings.print.PrintSettingsFragment;
import com.android.settings.privacy.PrivacyControlsFragment;
import com.android.settings.privacy.PrivacyDashboardFragment;
import com.android.settings.security.LockscreenDashboardFragment;
import com.android.settings.security.SecurityAdvancedSettings;
@@ -218,6 +219,7 @@ public class SettingsGateway {
LocationSettings.class.getName(),
WifiScanningFragment.class.getName(),
PrivacyDashboardFragment.class.getName(),
PrivacyControlsFragment.class.getName(),
LocationServices.class.getName(),
SecuritySettings.class.getName(),
SecurityAdvancedSettings.class.getName(),

4
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -234,7 +234,9 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
// If isValidPrivateVolume() is true, these preferences will become visible at
// onLoadFinished.
if (!isValidPrivateVolume()) {
if (isValidPrivateVolume()) {
mIsDocumentsPrefShown = isDocumentsPrefShown();
} else {
setPrivateStorageCategoryPreferencesVisibility(false);
}
}

61
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -38,6 +38,7 @@ import android.view.View;
import com.android.settings.R;
import com.android.settings.vpn2.VpnUtils;
import com.android.settingslib.utils.WorkPolicyUtils;
import java.util.Date;
import java.util.List;
@@ -54,6 +55,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
private final ConnectivityManager mCm;
private final VpnManager mVm;
private final Resources mResources;
private final WorkPolicyUtils mWorkPolicyUtils;
private static final int MY_USER_ID = UserHandle.myUserId();
@@ -67,6 +69,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
mCm = cm;
mVm = vm;
mResources = resources;
mWorkPolicyUtils = new WorkPolicyUtils(mContext, mPm, mUm, mDpm);
}
@Override
@@ -228,25 +231,12 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
@Override
public boolean hasWorkPolicyInfo() {
return (getWorkPolicyInfoIntentDO() != null) || (getWorkPolicyInfoIntentPO() != null);
return mWorkPolicyUtils.hasWorkPolicy();
}
@Override
public boolean showWorkPolicyInfo(Context activityContext) {
Intent intent = getWorkPolicyInfoIntentDO();
if (intent != null) {
activityContext.startActivity(intent);
return true;
}
intent = getWorkPolicyInfoIntentPO();
final UserInfo userInfo = getManagedProfileUserInfo();
if (intent != null && userInfo != null) {
activityContext.startActivityAsUser(intent, userInfo.getUserHandle());
return true;
}
return false;
return mWorkPolicyUtils.showWorkPolicyInfo(activityContext);
}
@Override
@@ -301,47 +291,6 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
return UserHandle.USER_NULL;
}
private Intent getWorkPolicyInfoIntentDO() {
final ComponentName ownerComponent = getDeviceOwnerComponent();
if (ownerComponent == null) {
return null;
}
// Only search for the required action in the Device Owner's package
final Intent intent =
new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO)
.setPackage(ownerComponent.getPackageName());
final List<ResolveInfo> activities = mPm.queryIntentActivities(intent, 0);
if (activities.size() != 0) {
return intent;
}
return null;
}
private Intent getWorkPolicyInfoIntentPO() {
final int userId = getManagedProfileUserId();
if (userId == UserHandle.USER_NULL) {
return null;
}
final ComponentName ownerComponent = mDpm.getProfileOwnerAsUser(userId);
if (ownerComponent == null) {
return null;
}
// Only search for the required action in the Profile Owner's package
final Intent intent =
new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO)
.setPackage(ownerComponent.getPackageName());
final List<ResolveInfo> activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId);
if (activities.size() != 0) {
return intent;
}
return null;
}
protected static class EnterprisePrivacySpan extends ClickableSpan {
private final Context mContext;

14
src/com/android/settings/media/MediaOutputIndicatorWorker.java
View File

@@ -34,6 +34,7 @@ import androidx.annotation.Nullable;
import com.android.settings.bluetooth.Utils;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.media.LocalMediaManager;
import com.android.settingslib.media.MediaDevice;
@@ -126,7 +127,7 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements
}
@Nullable
MediaController getActiveLocalMediaController() {
public MediaController getActiveLocalMediaController() {
return MediaOutputUtils.getActiveLocalMediaController(mContext.getSystemService(
MediaSessionManager.class));
}
@@ -156,7 +157,7 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements
return mMediaDevices;
}
MediaDevice getCurrentConnectedMediaDevice() {
public MediaDevice getCurrentConnectedMediaDevice() {
return mLocalMediaManager.getCurrentConnectedDevice();
}
@@ -164,6 +165,15 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements
return mPackageName;
}
public boolean isDeviceBroadcasting() {
LocalBluetoothLeBroadcast broadcast =
mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();
if (broadcast == null) {
return false;
}
return broadcast.isEnabled(null);
}
private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {

3
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -87,7 +87,8 @@ public class EnabledNetworkModePreferenceController extends
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
visible = false;
} else if (carrierConfig == null) {
} else if (carrierConfig == null
|| !CarrierConfigManager.isConfigForIdentifiedCarrier(carrierConfig)) {
visible = false;
} else if (carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)

80
src/com/android/settings/notification/MediaVolumePreferenceController.java
View File

@@ -16,16 +16,32 @@
package com.android.settings.notification;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.media.AudioManager;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.media.MediaOutputIndicatorWorker;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.media.MediaDevice;
public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceController {
private static final String TAG = "MediaVolumePreCtrl";
private static final String KEY_MEDIA_VOLUME = "media_volume";
private MediaOutputIndicatorWorker mWorker;
public MediaVolumePreferenceController(Context context) {
super(context, KEY_MEDIA_VOLUME);
}
@@ -66,4 +82,66 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont
public int getMuteIcon() {
return R.drawable.ic_media_stream_off;
}
private boolean isSupportEndItem() {
return getWorker() != null
&& getWorker().getActiveLocalMediaController() != null
&& isConnectedBLEDevice();
}
private boolean isConnectedBLEDevice() {
final MediaDevice device = getWorker().getCurrentConnectedMediaDevice();
if (device != null) {
return device.isBLEDevice();
}
return false;
}
@Override
public SliceAction getSliceEndItem(Context context) {
if (!isSupportEndItem()) {
Log.d(TAG, "The slice doesn't support end item");
return null;
}
final Intent intent = new Intent();
if (getWorker().isDeviceBroadcasting()) {
// TODO(b/229577323) : Get the intent action for the Media Output Broadcast Dialog
// in SystemUI
} else {
// TODO(b/229577518) : Get the intent action of the Bluetooth Broadcast Dialog
// for user to choose the action
}
final PendingIntent pi = PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
final IconCompat icon = getBroadcastIcon(context);
return SliceAction.createDeeplink(pi, icon, ListBuilder.ICON_IMAGE, getPreferenceKey());
}
private IconCompat getBroadcastIcon(Context context) {
final Drawable drawable = context.getDrawable(
com.android.settingslib.R.drawable.settings_input_antenna);
if (drawable != null) {
drawable.setTint(Utils.getColorAccentDefaultColor(context));
return Utils.createIconWithDrawable(drawable);
}
return null;
}
private MediaOutputIndicatorWorker getWorker() {
if (mWorker == null) {
mWorker = SliceBackgroundWorker.getInstance(getUri());
}
return mWorker;
}
private Uri getUri() {
return CustomSliceRegistry.VOLUME_MEDIA_URI;
}
@Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return MediaOutputIndicatorWorker.class;
}
}

3
src/com/android/settings/panel/PanelSlicesAdapter.java
View File

@@ -143,6 +143,9 @@ public class PanelSlicesAdapter
sliceView.setVisibility(View.GONE);
}
// Add divider for the end icon
sliceView.setShowActionDividers(true);
// Log Panel interaction
sliceView.setOnSliceActionListener(
((eventInfo, sliceItem) -> {

1
src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
View File

@@ -58,6 +58,7 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon
new SubSettingLauncher(mContext)
.setDestination(alternativeFragmentClassname)
.setSourceMetricsCategory(getMetricsCategory())
.setIsSecondLayerPage(true)
.launch();
return true;
}

5
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -339,6 +339,11 @@ public class SliceBuilderUtils {
inputRangeBuilder.setSubtitle(subtitleText);
}
SliceAction endItemAction = sliderController.getSliceEndItem(context);
if (endItemAction != null) {
inputRangeBuilder.addEndItem(endItemAction);
}
return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
.setAccentColor(color)
.addInputRange(inputRangeBuilder)

20
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -377,10 +377,22 @@ public class EnterprisePrivacyFeatureProviderImplTest {
}
@Test
public void workPolicyInfo_profileOwner_shouldResolveIntent() {
public void workPolicyInfo_profileOwner_shouldResolveIntent()
throws PackageManager.NameNotFoundException {
when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
when(mDevicePolicyManager.getProfileOwnerAsUser(mManagedProfileUserId)).thenReturn(mOwner);
List<UserHandle> mAllProfiles = new ArrayList<>();
mAllProfiles.add(new UserHandle(mManagedProfileUserId));
when(mUserManager.getAllProfiles()).thenReturn(mAllProfiles);
when(mUserManager.isManagedProfile(mManagedProfileUserId)).thenReturn(true);
when(mContext.getPackageName()).thenReturn("somePackageName");
when(mContext.createPackageContextAsUser(
eq(mContext.getPackageName()),
anyInt(),
any(UserHandle.class))
).thenReturn(mContext);
when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
when(mDevicePolicyManager.getProfileOwner()).thenReturn(mOwner);
// If the intent is not resolved, then there's no info to show for PO
assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
@@ -441,7 +453,7 @@ public class EnterprisePrivacyFeatureProviderImplTest {
}
if (profileOwner) {
when(mPackageManager.queryIntentActivitiesAsUser(
intentEquals(intent), anyInt(), eq(mManagedProfileUserId)))
intentEquals(intent), anyInt(), eq(UserHandle.of(mManagedProfileUserId))))
.thenReturn(activities);
}

9
tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
View File

@@ -106,6 +106,7 @@ public class EnabledNetworkModePreferenceControllerTest {
mPersistableBundle = new PersistableBundle();
doReturn(mPersistableBundle).when(mCarrierConfigCache).getConfig();
doReturn(mPersistableBundle).when(mCarrierConfigCache).getConfigForSubId(SUB_ID);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
mPreference = new ListPreference(mContext);
mController = new EnabledNetworkModePreferenceController(mContext, KEY);
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
@@ -145,6 +146,14 @@ public class EnabledNetworkModePreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@UiThreadTest
@Test
public void getAvailabilityStatus_carrierConfigNotReady_returnUnavailable() {
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@UiThreadTest
@Test
public void getAvailabilityStatus_notWorldPhone_returnAvailable() {