Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 12426030 from 43f09d11a4 to 25Q1-release

Browse Source 
Change-Id: I546ea9c574483e9e9623e3a5e34cbd49812b47a5
This commit is contained in:
Android Build Coastguard Worker
2024-09-28 01:23:13 +00:00
parent ca1816c307 43f09d11a4
commit 4946bd4a41
11 changed files with 270 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/modes_set_schedule_layout.xml
View File

@@ -127,7 +127,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Small" />
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Small"
android:textColor="?android:attr/textColorSecondary" />
<!-- right side line divider -->
<View

7
res/values/strings.xml
View File

@@ -8657,6 +8657,13 @@
<!-- Configure Notifications: Title for the option controlling notifications for work profile. [CHAR LIMIT=30] -->
<string name="locked_work_profile_notification_title">When work profile is locked</string>
<!-- Configure notifications: Title for the option controlling whether or not to minimalize the
number of notifications to show on the lock screen[CHAR LIMIT=60] -->
<string name="lock_screen_notif_minimalism">Lock screen notification minimalism</string>
<!-- Configure notifications: Summary for option lock_screen_notif_minimalism. [CHAR LIMIT=100] -->
<string name="lock_screen_notif_minimalism_summary">Show fewer notifications on lock screen</string>
<!-- Configure notifications: Title for the option controlling whether only new notifications are displayed to the user
on the lock screen [CHAR LIMIT=60] -->
<string name="unseen_notifs_lock_screen">Show only new notifications on lock screen</string>

24
res/xml/configure_notification_settings.xml
View File

@@ -136,8 +136,16 @@
/>
<SwitchPreferenceCompat
android:key="lock_screen_show_only_unseen_notifs"
android:key="lock_screen_notif_minimalism"
android:order="19"
android:title="@string/lock_screen_notif_minimalism"
android:summary="@string/lock_screen_notif_minimalism_summary"
settings:controller="com.android.settings.notification.LockscreenNotificationMinimalismPreferenceController"
/>
<SwitchPreferenceCompat
android:key="lock_screen_show_only_unseen_notifs"
android:order="20"
android:title="@string/unseen_notifs_lock_screen"
android:summary="@string/unseen_notifs_lock_screen_summary"
settings:controller="com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController"
@@ -146,7 +154,7 @@
<Preference
android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"
android:key="flash_notifications_preference"
android:order="20"
android:order="21"
android:persistent="false"
android:title="@string/flash_notifications_title"
settings:searchable="false"
@@ -154,7 +162,7 @@
<com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings"
android:order="21"
android:order="22"
android:title="@string/cell_broadcast_settings"
settings:useAdminDisabledSummary="true">
<intent
@@ -165,33 +173,33 @@
<SwitchPreferenceCompat
android:key="silent_icons"
android:order="22"
android:order="23"
android:title="@string/silent_notifications_status_bar"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
<SwitchPreferenceCompat
android:key="show_snooze_options"
android:order="23"
android:order="24"
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
<!-- Notification badging -->
<SwitchPreferenceCompat
android:key="notification_badging"
android:order="24"
android:order="25"
android:title="@string/notification_badging_title"
settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
<!-- Pulse notification light, on devices that support it -->
<SwitchPreferenceCompat
android:key="notification_pulse"
android:order="25"
android:order="26"
android:title="@string/notification_pulse_title"
settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
<SwitchPreferenceCompat
android:key="notification_assistant"
android:order="26"
android:order="27"
android:title="@string/notification_assistant_title"
android:summary="@string/notification_assistant_summary"
settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>

2
res/xml/special_access.xml
View File

@@ -60,7 +60,7 @@
<Preference
android:key="zen_access"
android:title="@string/manage_zen_access_title"
android:title="@string/manage_zen_modes_access_title"
android:order="-1500"
android:fragment="com.android.settings.notification.zen.ZenAccessSettings"
settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />

2
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -715,7 +715,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
if (mPackageName == null) {
final Intent intent = args == null ?
getActivity().getIntent() : (Intent) args.getParcelable("intent");
if (intent != null) {
if (intent != null && intent.getData() != null) {
mPackageName = intent.getData().getSchemeSpecificPart();
}
}

74
src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java Normal file
View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2024 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.notification;
import static android.provider.Settings.Secure.LOCK_SCREEN_NOTIFICATION_MINIMALISM;
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
import android.content.Context;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class LockscreenNotificationMinimalismPreferenceController
extends TogglePreferenceController {
@VisibleForTesting
static final int ON = 1;
@VisibleForTesting
static final int OFF = 0;
public LockscreenNotificationMinimalismPreferenceController(
Context context,
String preferenceKey) {
super(context, preferenceKey);
}
@Override
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(),
LOCK_SCREEN_NOTIFICATION_MINIMALISM, ON) == ON;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.Secure.putInt(mContext.getContentResolver(),
LOCK_SCREEN_NOTIFICATION_MINIMALISM, isChecked ? ON : OFF);
}
@Override
public int getAvailabilityStatus() {
if (!Flags.notificationMinimalism()) {
return CONDITIONALLY_UNAVAILABLE;
}
int lockScreenNotif = Settings.Secure.getInt(mContext.getContentResolver(),
LOCK_SCREEN_SHOW_NOTIFICATIONS, 0);
if (lockScreenNotif == 0) {
return DISABLED_DEPENDENT_SETTING;
}
return AVAILABLE;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
}

14
src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification;
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS;
import android.content.Context;
@@ -23,6 +24,7 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
@@ -55,6 +57,13 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController
@Override
public int getAvailabilityStatus() {
if (Flags.notificationMinimalism()) {
if (!isNotifOnLockScreenEnabled()) {
return DISABLED_DEPENDENT_SETTING;
}
// We want to show the switch when the lock screen notification minimalism flag is on.
return AVAILABLE;
}
int setting = Settings.Secure.getInt(mContext.getContentResolver(),
LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET);
if (setting == UNSET) {
@@ -68,4 +77,9 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
private boolean isNotifOnLockScreenEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(),
LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) == 1;
}
}

9
src/com/android/settings/wifi/repository/WifiHotspotRepository.java
View File

@@ -356,10 +356,11 @@ public class WifiHotspotRepository {
log("setSpeedType(), setBand(BAND_2GHZ)");
configBuilder.setBand(BAND_2GHZ);
}
// Set the security type back to WPA2/WPA3 if we're moving from 6GHz to something else.
if ((config.getBand() & BAND_6GHZ) != 0) {
configBuilder.setPassphrase(
generatePassword(config), SECURITY_TYPE_WPA3_SAE_TRANSITION);
// Set the security type back to WPA2/WPA3 if the password is at least 8 characters and
// we're moving from 6GHz to something else.
String passphrase = generatePassword(config);
if ((passphrase.length() >= 8) && (config.getBand() & BAND_6GHZ) != 0) {
configBuilder.setPassphrase(passphrase, SECURITY_TYPE_WPA3_SAE_TRANSITION);
}
}
setSoftApConfiguration(configBuilder.build());

105
tests/robotests/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,105 @@
/*
* Copyright (C) 2024 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.notification;
import static android.provider.Settings.Secure.LOCK_SCREEN_NOTIFICATION_MINIMALISM;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class LockscreenNotificationMinimalismPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceScreen mScreen;
private LockscreenNotificationMinimalismPreferenceController mController;
private Preference mPreference;
static final int ON = 1;
static final int OFF = 0;
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
doReturn(mock(DevicePolicyManager.class)).when(mContext)
.getSystemService(Context.DEVICE_POLICY_SERVICE);
mController = new LockscreenNotificationMinimalismPreferenceController(mContext,
"key");
mPreference = new Preference(RuntimeEnvironment.application);
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
}
@Test
@DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void display_featureFlagOff_shouldNotDisplay() {
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isFalse();
}
@Test
@EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void display_featureFlagOn_shouldDisplay() {
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isTrue();
}
@Test
@EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void isChecked_settingIsOff_shouldReturnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(),
LOCK_SCREEN_NOTIFICATION_MINIMALISM, OFF);
assertThat(mController.isChecked()).isFalse();
}
@Test
@EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void isChecked_settingIsOn_shouldReturnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(),
LOCK_SCREEN_NOTIFICATION_MINIMALISM, ON);
assertThat(mController.isChecked()).isTrue();
}
}

17
tests/robotests/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java
View File

@@ -29,12 +29,16 @@ import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -53,6 +57,8 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {
private ShowOnlyUnseenNotificationsOnLockscreenPreferenceController mController;
private Preference mPreference;
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
@@ -67,12 +73,14 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {
}
@Test
@DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void display_configUnset_shouldNotDisplay() {
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isFalse();
}
@Test
@DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void display_configSet_showDisplay() {
Settings.Secure.putInt(mContext.getContentResolver(),
LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);
@@ -80,6 +88,15 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {
assertThat(mPreference.isVisible()).isTrue();
}
@Test
@EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)
public void display_configUnset_minimalismEnabled_shouldDisplay() {
Settings.Secure.putInt(mContext.getContentResolver(),
LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, ON);
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isTrue();
}
@Test
public void isChecked_settingIsOff_shouldReturnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(),

33
tests/unit/src/com/android/settings/wifi/repository/WifiHotspotRepositoryTest.java
View File

@@ -78,6 +78,7 @@ import java.util.Arrays;
public class WifiHotspotRepositoryTest {
static final String WIFI_SSID = "wifi_ssid";
static final String WIFI_PASSWORD = "wifi_password";
static final String WIFI_PASSWORD_SHORT = "wifi";
static final int WIFI_5GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ;
static final int WIFI_6GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ_6GHZ;
@@ -477,7 +478,7 @@ public class WifiHotspotRepositoryTest {
@Test
public void setSpeedType_2g5ghzTo6ghz_setConfigSecurityToWpa3() {
mockConfig(SPEED_2GHZ_5GHZ, SECURITY_TYPE_WPA3_SAE_TRANSITION);
mockConfig(SPEED_2GHZ_5GHZ, SECURITY_TYPE_WPA3_SAE_TRANSITION, WIFI_PASSWORD);
mRepository.setSpeedType(SPEED_6GHZ);
@@ -497,10 +498,32 @@ public class WifiHotspotRepositoryTest {
SparseIntArray channels = mSoftApConfigCaptor.getValue().getChannels();
assertThat(channels.get(BAND_2GHZ, CHANNEL_NOT_FOUND)).isNotEqualTo(CHANNEL_NOT_FOUND);
assertThat(channels.get(BAND_2GHZ_5GHZ, CHANNEL_NOT_FOUND)).isNotEqualTo(CHANNEL_NOT_FOUND);
}
@Test
public void setSpeedType_6ghzTo2g5ghzWith8CharPassphrase_changesSecurityToWpa3Transition() {
mockConfigSpeedType(SPEED_6GHZ);
mRepository.mIsDualBand = true;
mRepository.setSpeedType(SPEED_2GHZ_5GHZ);
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
.isEqualTo(SECURITY_TYPE_WPA3_SAE_TRANSITION);
}
@Test
public void setSpeedType_6ghzTo2g5ghzWithLessThan8CharPassphrase_doesNotChangeSecurity() {
mockConfig(SECURITY_TYPE_WPA3_SAE, SPEED_6GHZ, WIFI_PASSWORD_SHORT);
mRepository.mIsDualBand = true;
mRepository.setSpeedType(SPEED_2GHZ_5GHZ);
verify(mWifiManager).setSoftApConfiguration(mSoftApConfigCaptor.capture());
assertThat(mSoftApConfigCaptor.getValue().getSecurityType())
.isEqualTo(SECURITY_TYPE_WPA3_SAE);
}
@Test
public void setSpeedType_2ghzTo5ghz_setConfigBandTo5ghzPreferred() {
mockConfigSpeedType(SPEED_2GHZ);
@@ -784,18 +807,18 @@ public class WifiHotspotRepositoryTest {
}
private void mockConfigSecurityType(int securityType) {
mockConfig(securityType, SPEED_2GHZ);
mockConfig(securityType, SPEED_2GHZ,
(securityType == SECURITY_TYPE_OPEN) ? null : WIFI_PASSWORD);
}
private void mockConfigSpeedType(int speedType) {
mockConfig(SECURITY_TYPE_WPA3_SAE, speedType);
mockConfig(SECURITY_TYPE_WPA3_SAE, speedType, WIFI_PASSWORD);
}
private void mockConfig(int securityType, int speedType) {
private void mockConfig(int securityType, int speedType, String passphrase) {
SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
// Security Type
doReturn(securityType).when(mSecurityType).getValue();
String passphrase = (securityType == SECURITY_TYPE_OPEN) ? null : WIFI_PASSWORD;
configBuilder.setPassphrase(passphrase, securityType).build();
// Speed Type