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

Merge "Set content description for the "settings" of starred contacts, priority conversations, etc" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-02 00:51:31 +00:00
committed by Android (Google) Code Review
parent bdd8c89ed2 58a110bc48
commit 2d9dc0521f
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
View File

@@ -29,6 +29,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.notification.modes.ZenModesBackend;
@@ -58,6 +59,8 @@ public class ZenModeAppsPreferenceController extends
pref.setExtraWidgetOnClickListener(p -> {
launchPrioritySettings();
});
pref.setExtraWidgetContentDescription(
mContext.getString(R.string.zen_mode_apps_priority_apps_settings));
}
}
super.displayPreference(screen);

28
src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
View File

@@ -38,6 +38,8 @@ import android.service.notification.ZenPolicy;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -118,25 +120,27 @@ class ZenModePrioritySendersPreferenceController
public void displayPreference(PreferenceScreen screen) {
mPreferenceCategory = checkNotNull(screen.findPreference(getPreferenceKey()));
if (mPreferenceCategory.getPreferenceCount() == 0) {
makeSelectorPreference(KEY_STARRED,
com.android.settings.R.string.zen_mode_from_starred, mIsMessages, true);
makeSelectorPreference(KEY_CONTACTS,
com.android.settings.R.string.zen_mode_from_contacts, mIsMessages, true);
makeSelectorPreference(KEY_STARRED, R.string.zen_mode_from_starred,
R.string.zen_mode_from_starred_settings, mIsMessages, true);
makeSelectorPreference(KEY_CONTACTS, R.string.zen_mode_from_contacts,
R.string.zen_mode_from_contacts_settings, mIsMessages, true);
if (mIsMessages) {
// "Any conversations" will only be available as option if it is the current value.
// Because it's confusing and we don't want users setting it up that way, but apps
// could create such ZenPolicies and we must show that.
makeSelectorPreference(KEY_ANY_CONVERSATIONS,
com.android.settings.R.string.zen_mode_from_all_conversations, true,
R.string.zen_mode_from_all_conversations,
R.string.zen_mode_from_conversations_settings, true,
/* isVisibleByDefault= */ false);
makeSelectorPreference(KEY_IMPORTANT_CONVERSATIONS,
com.android.settings.R.string.zen_mode_from_important_conversations, true,
R.string.zen_mode_from_important_conversations,
R.string.zen_mode_from_conversations_settings, true,
true);
}
makeSelectorPreference(KEY_ANY,
com.android.settings.R.string.zen_mode_from_anyone, mIsMessages, true);
R.string.zen_mode_from_anyone, null, mIsMessages, true);
makeSelectorPreference(KEY_NONE,
com.android.settings.R.string.zen_mode_none_messages, mIsMessages, true);
R.string.zen_mode_none_messages, null, mIsMessages, true);
}
super.displayPreference(screen);
}
@@ -229,8 +233,9 @@ class ZenModePrioritySendersPreferenceController
return CONVERSATION_SENDERS_UNSET;
}
private void makeSelectorPreference(String key, int titleId,
boolean isCheckbox, boolean isVisibleByDefault) {
private void makeSelectorPreference(String key, @StringRes int titleId,
@Nullable @StringRes Integer settingsContentDescriptionResId, boolean isCheckbox,
boolean isVisibleByDefault) {
final SelectorWithWidgetPreference pref =
new SelectorWithWidgetPreference(mPreferenceCategory.getContext(), isCheckbox);
pref.setKey(key);
@@ -241,6 +246,9 @@ class ZenModePrioritySendersPreferenceController
View.OnClickListener widgetClickListener = getWidgetClickListener(key);
if (widgetClickListener != null) {
pref.setExtraWidgetOnClickListener(widgetClickListener);
pref.setExtraWidgetContentDescription(settingsContentDescriptionResId != null
? mContext.getString(settingsContentDescriptionResId)
: null);
}
mPreferenceCategory.addPreference(pref);