Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev
diff --git a/res/layout/notification_history_log_row.xml b/res/layout/notification_history_log_row.xml
index 136af38..c77b005 100644
--- a/res/layout/notification_history_log_row.xml
+++ b/res/layout/notification_history_log_row.xml
@@ -28,19 +28,21 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginBottom="6dp">
- <RelativeLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="@*android:dimen/status_bar_icon_size"
android:gravity="center_vertical">
<TextView
android:id="@+id/title"
- android:layout_width="match_parent"
+ android:layout_weight="1"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
+ android:layout_toStartOf="@id/alerted_icon"
android:textAlignment="viewStart"/>
<ImageView
@@ -51,8 +53,9 @@
android:layout_marginStart="6dp"
android:paddingTop="1dp"
android:scaleType="fitCenter"
- android:visibility="gone"
+ android:visibility="invisible"
android:layout_toEndOf="@id/title"
+ android:layout_toStartOf="@id/timestamp"
android:tint="?android:attr/textColorSecondary"
android:src="@drawable/ic_notifications_alert"/>
@@ -67,7 +70,7 @@
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
android:textAlignment="viewEnd"
/>
- </RelativeLayout>
+ </LinearLayout>
<TextView
android:id="@+id/text"
diff --git a/res/layout/notification_sbn_log_row.xml b/res/layout/notification_sbn_log_row.xml
index e94150d..40c81fa 100644
--- a/res/layout/notification_sbn_log_row.xml
+++ b/res/layout/notification_sbn_log_row.xml
@@ -79,7 +79,6 @@
android:layout_marginEnd="6dp"
android:paddingTop="1dp"
android:scaleType="fitCenter"
- android:visibility="gone"
android:layout_toStartOf="@id/timestamp"
/>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index a3ad4207..45ecd61 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -470,7 +470,7 @@
<EditText android:id="@+id/proxy_pac"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/wifi_item_content"
+ style="@style/wifi_item_edit_content"
android:hint="@string/proxy_url_hint"
android:inputType="textNoSuggestions"
android:singleLine="true"/>
@@ -559,27 +559,6 @@
</LinearLayout>
- <LinearLayout android:id="@+id/privacy_settings_fields"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/wifi_item"
- android:visibility="gone">
-
- <TextView android:id="@+id/privacy_settings_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="@style/wifi_item_label"
- android:text="@string/wifi_privacy_settings" />
-
- <Spinner android:id="@+id/privacy_settings"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/wifi_item_spinner"
- android:prompt="@string/wifi_privacy_settings"
- android:entries="@array/wifi_privacy_entries"/>
-
- </LinearLayout>
-
<LinearLayout android:id="@+id/staticip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -680,6 +659,26 @@
</LinearLayout>
</LinearLayout>
+ <LinearLayout android:id="@+id/privacy_settings_fields"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item"
+ android:visibility="gone">
+
+ <TextView android:id="@+id/privacy_settings_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_label"
+ android:text="@string/wifi_privacy_settings" />
+
+ <Spinner android:id="@+id/privacy_settings"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_spinner"
+ android:prompt="@string/wifi_privacy_settings"
+ android:entries="@array/wifi_privacy_entries"/>
+ </LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/zen_rule_name.xml b/res/layout/zen_rule_name.xml
index 90b4fbe..afa97ac 100755
--- a/res/layout/zen_rule_name.xml
+++ b/res/layout/zen_rule_name.xml
@@ -21,7 +21,7 @@
<EditText
android:id="@+id/zen_mode_rule_name"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="48dp"
android:singleLine="true"
android:inputType="textCapSentences"
android:hint="@string/zen_mode_rule_name_hint"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 81c76e4..da4583b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2031,8 +2031,10 @@
<string name="wifi_ip_settings">IP settings</string>
<!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->
<string name="wifi_privacy_settings">Privacy</string>
- <!-- Label for the subscription detail preference. [CHAR LIMIT=32] -->
- <string name="wifi_subscription_detail">Subscription details</string>
+ <!-- Label for the subscription preference. [CHAR LIMIT=32] -->
+ <string name="wifi_subscription">Subscription</string>
+ <!-- Summary text for the subscription preference. [CHAR LIMIT=NONE] -->
+ <string name="wifi_subscription_summary">View or change subscription</string>
<!-- Summary for Wifi MAC randomization option when it is ephemeral network [CHAR LIMIT=50] -->
<string name="wifi_privacy_settings_ephemeral_summary">Randomized MAC</string>
<!-- Title for the fragment to add a device into the wifi network [CHAR LIMIT=50] -->
@@ -8515,7 +8517,7 @@
<string name="interact_across_profiles_summary_1" translatable="false">Connected apps share permissions and can access each other\u2019s data.</string>
<!-- Apps > App Details > Connected personal and work apps > Description. [CHAR LIMIT=NONE] -->
- <string name="interact_across_profiles_summary_2" translatable="false">Only connect apps that you trust with your personal data.Your data may be exposed to your IT admin.</string>
+ <string name="interact_across_profiles_summary_2" translatable="false">Only connect apps that you trust with your personal data. Work apps may expose your data to your IT admin.</string>
<!-- Apps > App Details > Connected personal and work apps > Consent dialog title. [CHAR LIMIT=NONE] -->
<string name="interact_across_profiles_consent_dialog_title" translatable="false">Trust work %1$s with your personal data?</string>
@@ -11000,6 +11002,7 @@
<string-array name="graphics_driver_all_apps_preference_values">
<item>@string/graphics_driver_app_preference_default</item>
<item>@string/graphics_driver_app_preference_game_driver</item>
+ <item>@string/graphics_driver_app_preference_prerelease_driver</item>
</string-array>
<!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->
<string-array name="graphics_driver_app_preference_values">
@@ -11429,22 +11432,6 @@
<!-- Mobile network details page. Label for an option that lets the user delete an eSIM from
the device. [CHAR LIMIT=60] -->
<string name="mobile_network_erase_sim">Erase SIM</string>
- <!-- Title of a confirmation dialog for deleting an eSIM from the device.
- [CHAR LIMIT=60] -->
- <string name="mobile_network_erase_sim_dialog_title">Erase this downloaded SIM?</string>
- <!-- Body text of of a confirmation dialog for deleting an eSIM from the device.
- [CHAR LIMIT=NONE] -->
- <string name="mobile_network_erase_sim_dialog_body">
- Erasing this SIM removes <xliff:g id="carrier" example="Verizon">%1$s</xliff:g> service
- from this device.\n\nService for <xliff:g id="carrier" example="Verizon">%2$s</xliff:g>
- won\u2019t be canceled.
- </string>
- <!-- OK button on a confirmation dialog for deleting an eSIM from the device.
- [CHAR LIMIT=30] -->
- <string name="mobile_network_erase_sim_dialog_ok">Erase</string>
- <!-- Body text of the progress dialog we show while deleting an eSIM from the device.
- [CHAR LIMIT=NONE] -->
- <string name="mobile_network_erase_sim_dialog_progress">Erasing SIM\u2026</string>
<!-- Title of a dialog indicating that an error ocurred when deleting an eSIM from the device
[CHAR LIMIT=60] -->
@@ -11634,6 +11621,8 @@
<string name="media_output_panel_title">Switch output</string>
<!-- Summary for represent which device is playing media [CHAR LIMIT=NONE] -->
<string name="media_output_panel_summary_of_playing_device">Currently playing on <xliff:g id="device_name" example="Bose headphone">%1$s</xliff:g></string>
+ <!-- Summary for disconnected status [CHAR LIMIT=50] -->
+ <string name="media_output_disconnected_status"><xliff:g id="device_name" example="My device">%1$s</xliff:g> (disconnected)</string>
<!-- Label for the title on wfc disclaimer fragment. [CHAR LIMIT=40] -->
<string name="wfc_disclaimer_title_text">Important information</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 85b25e4..6ffd6df 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -144,8 +144,9 @@
<style name="wifi_item_edit_content">
<item name="android:paddingStart">4dip</item>
<item name="android:layout_marginStart">4dip</item>
- <item name="android:textSize">18sp</item>
<item name="android:textAlignment">viewStart</item>
+ <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
+ <item name="android:textColorHint">?android:attr/textColorSecondary</item>
<item name="android:minHeight">@dimen/min_tap_target_size</item>
</style>
@@ -590,6 +591,7 @@
<style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault.Medium">
<item name="android:textAllCaps">false</item>
+ <item name="android:textSize">14sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 6009f6a..29b82ef 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -45,7 +45,7 @@
<com.android.settingslib.widget.FooterPreference
android:key="battery_saver_footer_preference"
- android:selectable="false"
+ android:selectable="true"
android:title="@*android:string/battery_saver_description"
settings:allowDividerAbove="true"
settings:searchable="false"/>
diff --git a/res/xml/graphics_driver_settings.xml b/res/xml/graphics_driver_settings.xml
index c72c8fb..a1fa78c 100644
--- a/res/xml/graphics_driver_settings.xml
+++ b/res/xml/graphics_driver_settings.xml
@@ -24,8 +24,6 @@
android:key="graphics_driver_all_apps_preference"
android:title="@string/graphics_driver_all_apps_preference_title"
android:dialogTitle="@string/graphics_driver_all_apps_preference_title"
- android:entries="@array/graphics_driver_all_apps_preference_values"
- android:entryValues="@array/graphics_driver_all_apps_preference_values"
settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController">
</ListPreference>
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 156b744..30a7f67 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -69,6 +69,12 @@
android:entries="@array/wifi_privacy_entries"
android:entryValues="@array/wifi_privacy_values"/>
+ <Preference
+ android:key="subscription_detail"
+ android:title="@string/wifi_subscription"
+ android:summary="@string/wifi_subscription_summary"
+ settings:allowDividerAbove="true"/>
+
<SwitchPreference
android:key="auto_connect"
android:title="@string/wifi_auto_connect_title"
@@ -139,9 +145,4 @@
settings:enableCopying="true"/>
</PreferenceCategory>
- <Preference
- android:key="subscription_detail"
- android:title="@string/wifi_subscription_detail"
- settings:allowDividerAbove="true"/>
-
</PreferenceScreen>
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index 8da6fbb..76fb3ff 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -21,9 +21,11 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.ComponentName;
import android.content.Context;
+import android.content.res.Resources;
import android.os.Build;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.TypedValue;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.IntDef;
@@ -350,4 +352,32 @@
"Unsupported userShortcutType " + shortcutType);
}
}
+
+ /**
+ * Gets the width of the screen.
+ *
+ * @param context the current context.
+ * @return the width of the screen in terms of pixels.
+ */
+ public static int getScreenWidthPixels(Context context) {
+ final Resources resources = context.getResources();
+ final int screenWidthDp = resources.getConfiguration().screenWidthDp;
+
+ return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, screenWidthDp,
+ resources.getDisplayMetrics()));
+ }
+
+ /**
+ * Gets the height of the screen.
+ *
+ * @param context the current context.
+ * @return the height of the screen in terms of pixels.
+ */
+ public static int getScreenHeightPixels(Context context) {
+ final Resources resources = context.getResources();
+ final int screenHeightDp = resources.getConfiguration().screenHeightDp;
+
+ return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, screenHeightDp,
+ resources.getDisplayMetrics()));
+ }
}
diff --git a/src/com/android/settings/accessibility/AnimatedImagePreference.java b/src/com/android/settings/accessibility/AnimatedImagePreference.java
index 1609a3c..61e439f 100644
--- a/src/com/android/settings/accessibility/AnimatedImagePreference.java
+++ b/src/com/android/settings/accessibility/AnimatedImagePreference.java
@@ -34,6 +34,7 @@
public class AnimatedImagePreference extends Preference {
private Uri mImageUri;
+ private int mMaxHeight = -1;
AnimatedImagePreference(Context context) {
super(context);
@@ -45,20 +46,26 @@
super.onBindViewHolder(holder);
final ImageView imageView = holder.itemView.findViewById(R.id.animated_img);
- if (imageView != null && mImageUri != null) {
+ if (imageView == null) {
+ return;
+ }
+
+ if (mImageUri != null) {
imageView.setImageURI(mImageUri);
final Drawable drawable = imageView.getDrawable();
- if (drawable != null) {
- if (drawable instanceof AnimatedImageDrawable) {
- ((AnimatedImageDrawable) drawable).start();
- }
+ if (drawable instanceof AnimatedImageDrawable) {
+ ((AnimatedImageDrawable) drawable).start();
}
}
+
+ if (mMaxHeight > -1) {
+ imageView.setMaxWidth(mMaxHeight);
+ }
}
/**
- * Set image uri to display image in {@link ImageView}
+ * Sets image uri to display image in {@link ImageView}
*
* @param imageUri the Uri of an image
*/
@@ -68,4 +75,16 @@
notifyChanged();
}
}
+
+ /**
+ * Sets the maximum height of the view.
+ *
+ * @param maxHeight the maximum height of ImageView in terms of pixels.
+ */
+ public void setMaxHeight(int maxHeight) {
+ if (maxHeight != mMaxHeight) {
+ mMaxHeight = maxHeight;
+ notifyChanged();
+ }
+ }
}
diff --git a/src/com/android/settings/accessibility/HtmlTextPreference.java b/src/com/android/settings/accessibility/HtmlTextPreference.java
index fcf4725..4c528a3 100644
--- a/src/com/android/settings/accessibility/HtmlTextPreference.java
+++ b/src/com/android/settings/accessibility/HtmlTextPreference.java
@@ -23,9 +23,6 @@
import androidx.preference.PreferenceViewHolder;
-import java.util.List;
-import java.util.regex.Pattern;
-
/**
* A custom {@link android.widget.TextView} preference that shows html text with a custom tag
* filter.
@@ -35,7 +32,6 @@
private int mFlag = Html.FROM_HTML_MODE_COMPACT;
private Html.ImageGetter mImageGetter;
private Html.TagHandler mTagHandler;
- private List<String> mUnsupportedTagList;
HtmlTextPreference(Context context) {
super(context);
@@ -47,8 +43,8 @@
final TextView summaryView = holder.itemView.findViewById(android.R.id.summary);
if (summaryView != null && !TextUtils.isEmpty(getSummary())) {
- final String filteredText = getFilteredText(getSummary().toString());
- summaryView.setText(Html.fromHtml(filteredText, mFlag, mImageGetter, mTagHandler));
+ summaryView.setText(
+ Html.fromHtml(getSummary().toString(), mFlag, mImageGetter, mTagHandler));
}
}
@@ -87,39 +83,4 @@
notifyChanged();
}
}
-
- /**
- * Sets unsupported tag list, the text will be filtered though this list in advanced.
- *
- * @param unsupportedTagList the list of unsupported tags
- */
- public void setUnsupportedTagList(List<String> unsupportedTagList) {
- if (unsupportedTagList != null && !unsupportedTagList.equals(mUnsupportedTagList)) {
- mUnsupportedTagList = unsupportedTagList;
- notifyChanged();
- }
- }
-
- private String getFilteredText(String text) {
- if (mUnsupportedTagList == null) {
- return text;
- }
-
- int i = 1;
- for (String tag : mUnsupportedTagList) {
- if (!TextUtils.isEmpty(text)) {
- final String index = String.valueOf(i++);
- final String targetStart1 = "(?i)<" + tag + " ";
- final String targetStart2 = "(?i)<" + tag + ">";
- final String replacementStart1 = "<unsupportedtag" + index + " ";
- final String replacementStart2 = "<unsupportedtag" + index + ">";
- final String targetEnd = "(?i)</" + tag + ">";
- final String replacementEnd = "</unsupportedtag" + index + ">";
- text = Pattern.compile(targetStart1).matcher(text).replaceAll(replacementStart1);
- text = Pattern.compile(targetStart2).matcher(text).replaceAll(replacementStart2);
- text = Pattern.compile(targetEnd).matcher(text).replaceAll(replacementEnd);
- }
- }
- return text;
- }
}
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
deleted file mode 100644
index 82e8335..0000000
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (C) 2017 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.accessibility;
-
-import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME;
-import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.Dialog;
-import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.Drawable;
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.accessibility.AccessibilityManager;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.internal.accessibility.AccessibilityShortcutController;
-import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settingslib.accessibility.AccessibilityUtils;
-import com.android.settingslib.widget.CandidateInfo;
-import com.android.settingslib.widget.RadioButtonPreference;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Fragment for picking accessibility shortcut service
- */
-public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
- }
-
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.accessibility_shortcut_service_settings;
- }
-
- @Override
- protected List<? extends CandidateInfo> getCandidates() {
- final Context context = getContext();
- final AccessibilityManager accessibilityManager = context
- .getSystemService(AccessibilityManager.class);
- final List<AccessibilityServiceInfo> installedServices =
- accessibilityManager.getInstalledAccessibilityServiceList();
- final int numInstalledServices = installedServices.size();
-
- final List<CandidateInfo> candidates = new ArrayList<>(numInstalledServices);
- Map<ComponentName, ToggleableFrameworkFeatureInfo> frameworkFeatureInfoMap =
- AccessibilityShortcutController.getFrameworkShortcutFeaturesMap();
- for (ComponentName componentName : frameworkFeatureInfoMap.keySet()) {
- final int iconId;
- if (componentName.equals(COLOR_INVERSION_COMPONENT_NAME)) {
- iconId = R.drawable.ic_color_inversion;
- } else if (componentName.equals(DALTONIZER_COMPONENT_NAME)) {
- iconId = R.drawable.ic_daltonizer;
- } else {
- iconId = R.drawable.empty_icon;
- }
- candidates.add(new FrameworkCandidateInfo(frameworkFeatureInfoMap.get(componentName),
- iconId, componentName.flattenToString()));
- }
- for (int i = 0; i < numInstalledServices; i++) {
- candidates.add(new ServiceCandidateInfo(installedServices.get(i)));
- }
-
- return candidates;
- }
-
- @Override
- protected String getDefaultKey() {
- String shortcutServiceString = AccessibilityUtils
- .getShortcutTargetServiceComponentNameString(getContext(), UserHandle.myUserId());
- if (shortcutServiceString != null) {
- ComponentName shortcutName = ComponentName.unflattenFromString(shortcutServiceString);
- if (shortcutName != null) {
- return shortcutName.flattenToString();
- }
- }
- return null;
- }
-
- @Override
- protected boolean setDefaultKey(String key) {
- Settings.Secure.putString(getContext().getContentResolver(),
- Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, key);
- return true;
- }
-
- @Override
- public void onRadioButtonClicked(RadioButtonPreference selected) {
- final String selectedKey = selected.getKey();
-
- if (TextUtils.isEmpty(selectedKey)) {
- super.onRadioButtonClicked(selected);
- } else {
- final ComponentName selectedComponent = ComponentName.unflattenFromString(selectedKey);
- if (AccessibilityShortcutController.getFrameworkShortcutFeaturesMap()
- .containsKey(selectedComponent)) {
- // This is a framework feature. It doesn't need to be confirmed.
- onRadioButtonConfirmed(selectedKey);
- } else {
- final FragmentActivity activity = getActivity();
- if (activity != null) {
- ConfirmationDialogFragment.newInstance(this, selectedKey)
- .show(activity.getSupportFragmentManager(),
- ConfirmationDialogFragment.TAG);
- }
- }
- }
- }
-
- private void onServiceConfirmed(String serviceKey) {
- onRadioButtonConfirmed(serviceKey);
- }
-
- public static class ConfirmationDialogFragment extends InstrumentedDialogFragment
- implements View.OnClickListener {
- private static final String EXTRA_KEY = "extra_key";
- private static final String TAG = "ConfirmationDialogFragment";
- private IBinder mToken;
-
- public static ConfirmationDialogFragment newInstance(ShortcutServicePickerFragment parent,
- String key) {
- final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
- final Bundle argument = new Bundle();
- argument.putString(EXTRA_KEY, key);
- fragment.setArguments(argument);
- fragment.setTargetFragment(parent, 0);
- fragment.mToken = new Binder();
- return fragment;
- }
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- final Bundle bundle = getArguments();
- final String key = bundle.getString(EXTRA_KEY);
- final ComponentName serviceComponentName = ComponentName.unflattenFromString(key);
- final AccessibilityManager accessibilityManager = getActivity()
- .getSystemService(AccessibilityManager.class);
- AccessibilityServiceInfo info = accessibilityManager
- .getInstalledServiceInfoWithComponentName(serviceComponentName);
- return AccessibilityServiceWarning.createCapabilitiesDialog(getActivity(), info, this);
- }
-
- @Override
- public void onClick(View view) {
- final Fragment fragment = getTargetFragment();
- if ((view.getId() == R.id.permission_enable_allow_button)
- && (fragment instanceof ShortcutServicePickerFragment)) {
- final Bundle bundle = getArguments();
- ((ShortcutServicePickerFragment) fragment).onServiceConfirmed(
- bundle.getString(EXTRA_KEY));
- }
- dismiss();
- }
- }
-
- private class FrameworkCandidateInfo extends CandidateInfo {
- final ToggleableFrameworkFeatureInfo mToggleableFrameworkFeatureInfo;
- final int mIconResId;
- final String mKey;
-
- public FrameworkCandidateInfo(
- ToggleableFrameworkFeatureInfo frameworkFeatureInfo, int iconResId, String key) {
- super(true /* enabled */);
- mToggleableFrameworkFeatureInfo = frameworkFeatureInfo;
- mIconResId = iconResId;
- mKey = key;
- }
-
- @Override
- public CharSequence loadLabel() {
- return mToggleableFrameworkFeatureInfo.getLabel(getContext());
- }
-
- @Override
- public Drawable loadIcon() {
- return getContext().getDrawable(mIconResId);
- }
-
- @Override
- public String getKey() {
- return mKey;
- }
- }
-
- private class ServiceCandidateInfo extends CandidateInfo {
- final AccessibilityServiceInfo mServiceInfo;
-
- public ServiceCandidateInfo(AccessibilityServiceInfo serviceInfo) {
- super(true /* enabled */);
- mServiceInfo = serviceInfo;
- }
-
- @Override
- public CharSequence loadLabel() {
- final PackageManager pmw = getContext().getPackageManager();
- final CharSequence label =
- mServiceInfo.getResolveInfo().serviceInfo.loadLabel(pmw);
- if (label != null) {
- return label;
- }
-
- final ComponentName componentName = mServiceInfo.getComponentName();
- if (componentName != null) {
- try {
- final ApplicationInfo appInfo = pmw.getApplicationInfoAsUser(
- componentName.getPackageName(), 0, UserHandle.myUserId());
- return appInfo.loadLabel(pmw);
- } catch (PackageManager.NameNotFoundException e) {
- return null;
- }
- }
- return null;
- }
-
- @Override
- public Drawable loadIcon() {
- final ResolveInfo resolveInfo = mServiceInfo.getResolveInfo();
- return (resolveInfo.getIconResource() == 0)
- ? getContext().getDrawable(R.drawable.ic_accessibility_generic)
- : resolveInfo.loadIcon(getContext().getPackageManager());
- }
-
- @Override
- public String getKey() {
- return mServiceInfo.getComponentName().flattenToString();
- }
- }
-}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 19a0f2b..838a758 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -16,6 +16,9 @@
package com.android.settings.accessibility;
+import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
+import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
+
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -80,7 +83,6 @@
protected CharSequence mPackageName;
protected Uri mImageUri;
protected CharSequence mHtmlDescription;
- private static final String ANCHOR_TAG = "a";
private static final String DRAWABLE_FOLDER = "drawable";
protected static final String KEY_USE_SERVICE_PREFERENCE = "use_service";
protected static final String KEY_GENERAL_CATEGORY = "general_categories";
@@ -94,9 +96,8 @@
private CheckBox mSoftwareTypeCheckBox;
private CheckBox mHardwareTypeCheckBox;
- // For html description of accessibility service, third party developer must follow the rule,
- // such as <img src="R.drawable.fileName"/>, a11y settings will get third party resources
- // by this.
+ // For html description of accessibility service, must follow the rule, such as
+ // <img src="R.drawable.fileName"/>, a11y settings will get the resources successfully.
private static final String IMG_PREFIX = "R.drawable.";
private ImageView mImageGetterCacheView;
@@ -147,10 +148,12 @@
PreferenceScreen preferenceScreen = getPreferenceScreen();
if (mImageUri != null) {
+ final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
final AnimatedImagePreference animatedImagePreference = new AnimatedImagePreference(
getPrefContext());
animatedImagePreference.setImageUri(mImageUri);
animatedImagePreference.setSelectable(false);
+ animatedImagePreference.setMaxHeight(screenHalfHeight);
preferenceScreen.addPreference(animatedImagePreference);
}
@@ -195,14 +198,9 @@
introductionCategory.setTitle(title);
preferenceScreen.addPreference(introductionCategory);
- // For accessibility service, avoid malicious links made by third party developer.
- final List<String> unsupportedTagList = new ArrayList<>();
- unsupportedTagList.add(ANCHOR_TAG);
-
final HtmlTextPreference htmlTextPreference = new HtmlTextPreference(getPrefContext());
htmlTextPreference.setSummary(mHtmlDescription);
htmlTextPreference.setImageGetter(mImageGetter);
- htmlTextPreference.setUnsupportedTagList(unsupportedTagList);
htmlTextPreference.setSelectable(false);
introductionCategory.addPreference(htmlTextPreference);
}
@@ -383,14 +381,24 @@
mImageGetterCacheView.setAdjustViewBounds(true);
mImageGetterCacheView.setImageURI(imageUri);
- final Drawable drawable = mImageGetterCacheView.getDrawable().mutate();
- if (drawable != null) {
- drawable.setBounds(/* left= */0, /* top= */0, drawable.getIntrinsicWidth(),
- drawable.getIntrinsicHeight());
+ if (mImageGetterCacheView.getDrawable() == null) {
+ return null;
}
+ final Drawable drawable =
+ mImageGetterCacheView.getDrawable().mutate().getConstantState().newDrawable();
mImageGetterCacheView.setImageURI(null);
- mImageGetterCacheView.setImageDrawable(null);
+ final int imageWidth = drawable.getIntrinsicWidth();
+ final int imageHeight = drawable.getIntrinsicHeight();
+ final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
+ if ((imageWidth > getScreenWidthPixels(getPrefContext()))
+ || (imageHeight > screenHalfHeight)) {
+ return null;
+ }
+
+ drawable.setBounds(/* left= */0, /* top= */0, drawable.getIntrinsicWidth(),
+ drawable.getIntrinsicHeight());
+
return drawable;
}
diff --git a/src/com/android/settings/applications/AppStateManageExternalStorageBridge.java b/src/com/android/settings/applications/AppStateManageExternalStorageBridge.java
index 5a69035..7933062 100644
--- a/src/com/android/settings/applications/AppStateManageExternalStorageBridge.java
+++ b/src/com/android/settings/applications/AppStateManageExternalStorageBridge.java
@@ -22,20 +22,25 @@
import com.android.settingslib.applications.ApplicationsState;
+import java.util.List;
+
/**
* Retrieves information from {@link AppOpsManager} and {@link android.content.pm.PackageManager}
* regarding {@link AppOpsManager#OP_MANAGE_EXTERNAL_STORAGE} and
* {@link Manifest.permission#MANAGE_EXTERNAL_STORAGE}.
*/
public class AppStateManageExternalStorageBridge extends AppStateAppOpsBridge {
- private static final int APP_OPS_OP_CODE = AppOpsManager.OP_MANAGE_EXTERNAL_STORAGE;
+ private static final String APP_OP_STR = AppOpsManager.OPSTR_MANAGE_EXTERNAL_STORAGE;
private static final String[] PERMISSIONS = {
Manifest.permission.MANAGE_EXTERNAL_STORAGE
};
+ private final AppOpsManager mAppOpsManager;
+
public AppStateManageExternalStorageBridge(Context context, ApplicationsState appState,
Callback callback) {
- super(context, appState, callback, APP_OPS_OP_CODE, PERMISSIONS);
+ super(context, appState, callback, AppOpsManager.strOpToOp(APP_OP_STR), PERMISSIONS);
+ mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
}
@Override
@@ -43,6 +48,25 @@
app.extraInfo = getManageExternalStoragePermState(pkg, uid);
}
+ @Override
+ protected void loadAllExtraInfo() {
+ super.loadAllExtraInfo();
+ List<ApplicationsState.AppEntry> apps = mAppSession.getAllApps();
+ for (ApplicationsState.AppEntry app : apps) {
+ if (app.extraInfo instanceof PermissionState) {
+ ((PermissionState) app.extraInfo).appOpMode = mAppOpsManager.unsafeCheckOpNoThrow(
+ APP_OP_STR, app.info.uid, app.info.packageName);
+ }
+ }
+ }
+
+ @Override
+ public PermissionState getPermissionInfo(String pkg, int uid) {
+ PermissionState ps = super.getPermissionInfo(pkg, uid);
+ ps.appOpMode = mAppOpsManager.unsafeCheckOpNoThrow(APP_OP_STR, uid, pkg);
+ return ps;
+ }
+
/**
* Returns the MANAGE_EXTERNAL_STORAGE {@link AppStateAppOpsBridge.PermissionState} object
* associated with the given package and user.
diff --git a/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java b/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
index 63ce440..6c840d5 100644
--- a/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
+++ b/src/com/android/settings/applications/appinfo/ManageExternalStorageDetails.java
@@ -23,7 +23,6 @@
import android.view.View;
import android.view.ViewGroup;
-import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
@@ -110,8 +109,8 @@
*/
private void setManageExternalStorageState(boolean newState) {
logSpecialPermissionChange(newState, mPackageName);
- mAppOpsManager.setMode(AppOpsManager.OP_MANAGE_EXTERNAL_STORAGE,
- mPackageInfo.applicationInfo.uid, mPackageName, newState
+ mAppOpsManager.setUidMode(AppOpsManager.OP_MANAGE_EXTERNAL_STORAGE,
+ mPackageInfo.applicationInfo.uid, newState
? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
}
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 0cfb831..8db32e9 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -90,8 +90,10 @@
private static final String KEY_APP = "app";
private static final String KEY_FIELDS = "fields";
- private static final int LOADER_CHART_DATA = 2;
- private static final int LOADER_SUMMARY = 3;
+ @VisibleForTesting
+ static final int LOADER_CHART_DATA = 2;
+ @VisibleForTesting
+ static final int LOADER_SUMMARY = 3;
@VisibleForTesting
MobileDataEnabledListener mDataStateListener;
@@ -188,6 +190,13 @@
public void onResume() {
super.onResume();
mDataStateListener.start(mSubId);
+
+ // kick off loader for network history
+ // TODO: consider chaining two loaders together instead of reloading
+ // network history when showing app detail.
+ getLoaderManager().restartLoader(LOADER_CHART_DATA,
+ buildArgs(mTemplate), mNetworkCycleDataCallbacks);
+
updateBody();
}
@@ -195,6 +204,9 @@
public void onPause() {
super.onPause();
mDataStateListener.stop();
+
+ getLoaderManager().destroyLoader(LOADER_CHART_DATA);
+ getLoaderManager().destroyLoader(LOADER_SUMMARY);
}
@Override
@@ -246,12 +258,6 @@
final Context context = getActivity();
- // kick off loader for network history
- // TODO: consider chaining two loaders together instead of reloading
- // network history when showing app detail.
- getLoaderManager().restartLoader(LOADER_CHART_DATA,
- buildArgs(mTemplate), mNetworkCycleDataCallbacks);
-
// detail mode can change visible menus, invalidate
getActivity().invalidateOptionsMenu();
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
index 2013b45..b1a31fb 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
@@ -26,9 +26,7 @@
import android.content.res.Resources;
import android.os.Handler;
import android.os.Looper;
-import android.os.SystemProperties;
import android.provider.Settings;
-import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
@@ -60,9 +58,6 @@
GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
- private static final String PROPERTY_GFX_DRIVER_GAME = "ro.gfx.driver.0";
- private static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1";
-
private final Context mContext;
private final ContentResolver mContentResolver;
private final String mPreferenceTitle;
@@ -98,7 +93,8 @@
mPreferencePrereleaseDriver =
resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
mPreferenceSystem = resources.getString(R.string.graphics_driver_app_preference_system);
- mEntryList = constructEntryList();
+ mEntryList = GraphicsDriverEnableForAllAppsPreferenceController.constructEntryList(
+ mContext, true);
// TODO: Move this task to background if there's potential ANR/Jank.
// Update the UI when all the app infos are ready.
@@ -195,28 +191,6 @@
updateState(mPreferenceGroup);
}
- /**
- * Constructs and returns a list of graphics driver choices.
- */
- public CharSequence[] constructEntryList() {
- final String prereleaseDriverPackageName =
- SystemProperties.get(PROPERTY_GFX_DRIVER_PRERELEASE);
- final String gameDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_GAME);
-
- List<CharSequence> entryList = new ArrayList<>();
- entryList.add(mPreferenceDefault);
- if (!TextUtils.isEmpty(prereleaseDriverPackageName)) {
- entryList.add(mPreferencePrereleaseDriver);
- }
- if (!TextUtils.isEmpty(gameDriverPackageName)) {
- entryList.add(mPreferenceGameDriver);
- }
- entryList.add(mPreferenceSystem);
- CharSequence[] filteredEntryList = new CharSequence[entryList.size()];
- filteredEntryList = entryList.toArray(filteredEntryList);
- return filteredEntryList;
- }
-
// AppInfo class to achieve loading the application label only once
class AppInfo {
AppInfo(PackageManager packageManager, ApplicationInfo applicationInfo) {
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
index 4baa993..29f1014 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
@@ -18,10 +18,15 @@
import android.content.ContentResolver;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
import android.content.res.Resources;
+import android.os.Build;
import android.os.Handler;
import android.os.Looper;
+import android.os.SystemProperties;
import android.provider.Settings;
+import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
@@ -35,6 +40,11 @@
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import dalvik.system.VMRuntime;
+
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Controller of global switch to enable Game Driver for all Apps.
*/
@@ -47,6 +57,8 @@
public static final int GAME_DRIVER_ALL_APPS = 1;
public static final int GAME_DRIVER_PRERELEASE_ALL_APPS = 2;
public static final int GAME_DRIVER_OFF = 3;
+ public static final String PROPERTY_GFX_DRIVER_GAME = "ro.gfx.driver.0";
+ public static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1";
private final Context mContext;
private final ContentResolver mContentResolver;
@@ -54,6 +66,8 @@
private final String mPreferenceGameDriver;
private final String mPreferencePrereleaseDriver;
@VisibleForTesting
+ CharSequence[] mEntryList;
+ @VisibleForTesting
GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private ListPreference mPreference;
@@ -69,6 +83,7 @@
resources.getString(R.string.graphics_driver_app_preference_game_driver);
mPreferencePrereleaseDriver =
resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
+ mEntryList = constructEntryList(mContext, false);
mGraphicsDriverContentObserver =
new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
}
@@ -87,6 +102,8 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
+ mPreference.setEntries(mEntryList);
+ mPreference.setEntryValues(mEntryList);
mPreference.setOnPreferenceChangeListener(this);
}
@@ -147,4 +164,64 @@
public void onGraphicsDriverContentChanged() {
updateState(mPreference);
}
+
+ /**
+ * Constructs and returns a list of graphics driver choices.
+ */
+ public static CharSequence[] constructEntryList(Context context, boolean withSystem) {
+ final Resources resources = context.getResources();
+ final String prereleaseDriverPackageName =
+ SystemProperties.get(PROPERTY_GFX_DRIVER_PRERELEASE);
+ final String gameDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_GAME);
+
+ List<CharSequence> entryList = new ArrayList<>();
+ entryList.add(resources.getString(R.string.graphics_driver_app_preference_default));
+ final PackageManager pm = context.getPackageManager();
+ if (!TextUtils.isEmpty(prereleaseDriverPackageName)
+ && hasDriverPackage(pm, prereleaseDriverPackageName)) {
+ entryList.add(resources.getString(
+ R.string.graphics_driver_app_preference_prerelease_driver));
+ }
+ if (!TextUtils.isEmpty(gameDriverPackageName)
+ && hasDriverPackage(pm, gameDriverPackageName)) {
+ entryList.add(resources.getString(R.string.graphics_driver_app_preference_game_driver));
+ }
+ if (withSystem) {
+ entryList.add(resources.getString(R.string.graphics_driver_app_preference_system));
+ }
+ CharSequence[] filteredEntryList = new CharSequence[entryList.size()];
+ filteredEntryList = entryList.toArray(filteredEntryList);
+ return filteredEntryList;
+ }
+
+ private static boolean hasDriverPackage(PackageManager pm, String driverPackageName) {
+ final ApplicationInfo driverAppInfo;
+ try {
+ driverAppInfo = pm.getApplicationInfo(driverPackageName,
+ PackageManager.MATCH_SYSTEM_ONLY);
+ } catch (PackageManager.NameNotFoundException e) {
+ return false;
+ }
+ if (driverAppInfo.targetSdkVersion < Build.VERSION_CODES.O) {
+ return false;
+ }
+ final String abi = chooseAbi(driverAppInfo);
+ if (abi == null) {
+ return false;
+ }
+ return true;
+ }
+
+ private static String chooseAbi(ApplicationInfo ai) {
+ final String isa = VMRuntime.getCurrentInstructionSet();
+ if (ai.primaryCpuAbi != null
+ && isa.equals(VMRuntime.getInstructionSet(ai.primaryCpuAbi))) {
+ return ai.primaryCpuAbi;
+ }
+ if (ai.secondaryCpuAbi != null
+ && isa.equals(VMRuntime.getInstructionSet(ai.secondaryCpuAbi))) {
+ return ai.secondaryCpuAbi;
+ }
+ return null;
+ }
}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index 2ee77d9..2048be0 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -118,7 +118,8 @@
mDialog.setText(ID_PRL_VERSION_VALUE, getCdmaPrlVersion());
- if (mSubscriptionInfo != null && isCdmaLteEnabled()) {
+ if ((mSubscriptionInfo != null && isCdmaLteEnabled()) ||
+ (mSubscriptionInfo == null && isSimPresent(mSlotId))) {
// Show IMEI for LTE device
mDialog.setText(ID_IMEI_VALUE,
getTextAsDigits(mTelephonyManager.getImei(mSlotId)));
@@ -149,6 +150,15 @@
return mTelephonyManager.isGlobalModeEnabled();
}
+ boolean isSimPresent(int slotId) {
+ final int simState = mTelephonyManager.getSimState(slotId);
+ if ((simState != TelephonyManager.SIM_STATE_ABSENT) &&
+ (simState != TelephonyManager.SIM_STATE_UNKNOWN)) {
+ return true;
+ }
+ return false;
+ }
+
@VisibleForTesting
String getMeid() {
return mTelephonyManager.getMeid(mSlotId);
diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index 8faae30..9f5b49e 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -39,13 +39,13 @@
@Override
public boolean isChecked() {
- return hasSufficientPermission(mContext.getPackageManager()) && Settings.System.getInt(
+ return hasSufficientPermission(mContext.getPackageManager()) && Settings.Secure.getInt(
mContext.getContentResolver(), SYSTEM_KEY, DEFAULT_VALUE) != DEFAULT_VALUE;
}
@Override
public boolean setChecked(boolean isChecked) {
- Settings.System.putInt(mContext.getContentResolver(), SYSTEM_KEY,
+ Settings.Secure.putInt(mContext.getContentResolver(), SYSTEM_KEY,
isChecked ? 1 : DEFAULT_VALUE);
return true;
}
diff --git a/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java b/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
index 97ee221..530a541 100644
--- a/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
+++ b/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
@@ -15,19 +15,19 @@
package com.android.settings.display.darkmode;
import android.app.Dialog;
-import android.app.TimePickerDialog;
-import android.app.UiModeManager;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import android.app.settings.SettingsEnums;
+import android.os.PowerManager;
+
import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
-import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@@ -143,5 +143,11 @@
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.dark_mode_settings);
+ new BaseSearchIndexProvider(R.xml.dark_mode_settings) {
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return !context.getSystemService(PowerManager.class).isPowerSaveMode();
+ }
+ };
+
}
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index 17d7cee..de2f85f 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -24,6 +24,7 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.media.session.MediaController;
import android.net.Uri;
import android.util.Log;
@@ -36,6 +37,8 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -52,6 +55,7 @@
private Context mContext;
private LocalBluetoothManager mLocalBluetoothManager;
private LocalBluetoothProfileManager mProfileManager;
+ private MediaOutputIndicatorWorker mWorker;
public MediaOutputIndicatorSlice(Context context) {
mContext = context;
@@ -66,22 +70,18 @@
@Override
public Slice getSlice() {
if (!isVisible()) {
- return new ListBuilder(mContext, MEDIA_OUTPUT_INDICATOR_SLICE_URI, ListBuilder.INFINITY)
+ return new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
.setIsError(true)
.build();
}
final IconCompat icon = IconCompat.createWithResource(mContext,
com.android.internal.R.drawable.ic_settings_bluetooth);
final CharSequence title = mContext.getText(R.string.media_output_title);
- final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
- 0 /* requestCode */, getMediaOutputSliceIntent(), 0 /* flags */);
final SliceAction primarySliceAction = SliceAction.createDeeplink(
- primaryActionIntent, icon, ListBuilder.ICON_IMAGE, title);
+ getBroadcastIntent(), icon, ListBuilder.ICON_IMAGE, title);
@ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
// To set an empty icon to indent the row
- final ListBuilder listBuilder = new ListBuilder(mContext,
- MEDIA_OUTPUT_INDICATOR_SLICE_URI,
- ListBuilder.INFINITY)
+ final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
.setAccentColor(color)
.addRow(new ListBuilder.RowBuilder()
.setTitle(title)
@@ -96,11 +96,11 @@
return IconCompat.createWithBitmap(bitmap);
}
- private Intent getMediaOutputSliceIntent() {
- final Intent intent = new Intent()
- .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- return intent;
+ private PendingIntent getBroadcastIntent() {
+ final Intent intent = new Intent(getUri().toString());
+ intent.setClass(mContext, SliceBroadcastReceiver.class);
+ return PendingIntent.getBroadcast(mContext, 0, intent,
+ PendingIntent.FLAG_UPDATE_CURRENT);
}
@Override
@@ -120,6 +120,28 @@
return MediaOutputIndicatorWorker.class;
}
+ @Override
+ public void onNotifyChange(Intent i) {
+ final MediaController mediaController = getWorker().getActiveLocalMediaController();
+ final Intent intent = new Intent()
+ .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ if (mediaController != null) {
+ intent.putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
+ mediaController.getSessionToken());
+ intent.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+ mediaController.getPackageName());
+ }
+ mContext.startActivity(intent);
+ }
+
+ private MediaOutputIndicatorWorker getWorker() {
+ if (mWorker == null) {
+ mWorker = SliceBackgroundWorker.getInstance(getUri());
+ }
+ return mWorker;
+ }
+
private boolean isVisible() {
// To decide Slice's visibility.
// Return true if
diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
index 6498dd6..4ceeade 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
@@ -24,18 +24,21 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.media.AudioManager;
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
+import android.media.session.PlaybackState;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
+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.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import java.io.IOException;
-
/**
* Listener for background change from {@code BluetoothCallback} to update media output indicator.
*/
@@ -100,6 +103,27 @@
notifySliceChange();
}
+ @Nullable
+ MediaController getActiveLocalMediaController() {
+ final MediaSessionManager mMediaSessionManager = mContext.getSystemService(
+ MediaSessionManager.class);
+
+ for (MediaController controller : mMediaSessionManager.getActiveSessions(null)) {
+ final MediaController.PlaybackInfo pi = controller.getPlaybackInfo();
+ if (pi == null) {
+ return null;
+ }
+ final PlaybackState playbackState = controller.getPlaybackState();
+ if (playbackState == null) {
+ return null;
+ }
+ if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL
+ && playbackState.getState() == PlaybackState.STATE_PLAYING) {
+ return controller;
+ }
+ }
+ return null;
+ }
private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 3c9999e..92fa843 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -17,6 +17,7 @@
package com.android.settings.media;
import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
+import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
@@ -24,9 +25,12 @@
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri;
+import android.text.SpannableString;
import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
@@ -162,7 +166,7 @@
}
private ListBuilder.RowBuilder getMediaDeviceRow(MediaDevice device) {
- final String title = device.getName();
+ final String deviceName = device.getName();
final PendingIntent broadcastAction =
getBroadcastIntent(mContext, device.getId(), device.hashCode());
final IconCompat deviceIcon = getDeviceIconCompat(device);
@@ -170,9 +174,22 @@
final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
.setTitleItem(deviceIcon, ListBuilder.ICON_IMAGE)
.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,
- ListBuilder.ICON_IMAGE, title))
- .setTitle(title)
- .setSubtitle(device.isConnected() ? null : device.getSummary());
+ ListBuilder.ICON_IMAGE, deviceName));
+ // Append status to tile only for the disconnected Bluetooth device.
+ if (device.getDeviceType() == MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE
+ && !device.isConnected()) {
+ final SpannableString spannableTitle = new SpannableString(
+ mContext.getString(R.string.media_output_disconnected_status, deviceName));
+ spannableTitle.setSpan(new ForegroundColorSpan(Color.GRAY), deviceName.length(),
+ spannableTitle.length(), SPAN_EXCLUSIVE_EXCLUSIVE);
+ rowBuilder.setTitle(spannableTitle);
+ rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,
+ ListBuilder.ICON_IMAGE, spannableTitle));
+ } else {
+ rowBuilder.setTitle(deviceName);
+ rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,
+ ListBuilder.ICON_IMAGE, deviceName));
+ }
return rowBuilder;
}
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 091e7f5..6de2550 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -39,6 +39,7 @@
import android.view.View;
import android.view.View.OnKeyListener;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.EditTextPreference;
@@ -388,8 +389,12 @@
for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
}
+ }
- fillUI(icicle == null);
+ @Override
+ public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+ super.onViewStateRestored(savedInstanceState);
+ fillUI(savedInstanceState == null);
}
@VisibleForTesting
diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
index 6f61d91..1137e06 100644
--- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
@@ -20,6 +20,8 @@
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -30,6 +32,8 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.network.MobileDataContentObserver;
import com.android.settings.network.SubscriptionsChangeListener;
public class DataDuringCallsPreferenceController extends TelephonyTogglePreferenceController
@@ -39,11 +43,16 @@
private SwitchPreference mPreference;
private SubscriptionsChangeListener mChangeListener;
private TelephonyManager mManager;
+ private MobileDataContentObserver mMobileDataContentObserver;
+ private PreferenceScreen mScreen;
public DataDuringCallsPreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
mChangeListener = new SubscriptionsChangeListener(mContext, this);
+ mMobileDataContentObserver = new MobileDataContentObserver(
+ new Handler(Looper.getMainLooper()));
+ mMobileDataContentObserver.setOnMobileDataChangedListener(()->refreshPreference());
}
public void init(Lifecycle lifecycle, int subId) {
@@ -55,17 +64,20 @@
@OnLifecycleEvent(ON_RESUME)
public void onResume() {
mChangeListener.start();
+ mMobileDataContentObserver.register(mContext, mSubId);
}
@OnLifecycleEvent(ON_PAUSE)
public void onPause() {
mChangeListener.stop();
+ mMobileDataContentObserver.unRegister(mContext);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
+ mScreen = screen;
}
@Override
@@ -81,8 +93,8 @@
@Override
public int getAvailabilityStatus(int subId) {
- if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID ||
- SubscriptionManager.getDefaultDataSubscriptionId() == mSubId) {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)
+ || SubscriptionManager.getDefaultDataSubscriptionId() == subId) {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE;
@@ -101,4 +113,14 @@
public void onSubscriptionsChanged() {
updateState(mPreference);
}
+
+ /**
+ * Trigger displaying preference when Mobilde data content changed.
+ */
+ @VisibleForTesting
+ public void refreshPreference() {
+ if (mScreen != null) {
+ super.displayPreference(mScreen);
+ }
+ }
}
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
index eb0d020..6d3cdbb 100644
--- a/src/com/android/settings/network/telephony/NetworkScanHelper.java
+++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -25,6 +25,7 @@
import android.telephony.TelephonyScanManager;
import android.util.Log;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executor;
@@ -75,37 +76,6 @@
private static final int MAX_SEARCH_TIME_SEC = 300;
private static final int INCREMENTAL_RESULTS_PERIODICITY_SEC = 3;
- private static final NetworkScanRequest NETWORK_SCAN_REQUEST =
- new NetworkScanRequest(
- NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
- new RadioAccessSpecifier[]{
- // GSM
- new RadioAccessSpecifier(
- AccessNetworkType.GERAN,
- null /* bands */,
- null /* channels */),
- // LTE
- new RadioAccessSpecifier(
- AccessNetworkType.EUTRAN,
- null /* bands */,
- null /* channels */),
- // WCDMA
- new RadioAccessSpecifier(
- AccessNetworkType.UTRAN,
- null /* bands */,
- null /* channels */),
- // NR
- new RadioAccessSpecifier(
- AccessNetworkType.NGRAN,
- null /* bands */,
- null /* channels */)
- },
- SEARCH_PERIODICITY_SEC,
- MAX_SEARCH_TIME_SEC,
- INCREMENTAL_RESULTS,
- INCREMENTAL_RESULTS_PERIODICITY_SEC,
- null /* List of PLMN ids (MCC-MNC) */);
-
private final NetworkScanCallback mNetworkScanCallback;
private final TelephonyManager mTelephonyManager;
private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback;
@@ -120,6 +90,47 @@
mExecutor = executor;
}
+ private NetworkScanRequest createNetworkScanForPreferredAccessNetworks() {
+ long networkTypeBitmap3gpp = mTelephonyManager.getPreferredNetworkTypeBitmask()
+ & TelephonyManager.NETWORK_STANDARDS_FAMILY_BITMASK_3GPP;
+
+ List<RadioAccessSpecifier> radioAccessSpecifiers = new ArrayList<>();
+ // If the allowed network types are unknown or if they are of the right class, scan for
+ // them; otherwise, skip them to save scan time and prevent users from being shown networks
+ // that they can't connect to.
+ if (networkTypeBitmap3gpp == 0
+ || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_2G) != 0) {
+ radioAccessSpecifiers.add(
+ new RadioAccessSpecifier(AccessNetworkType.GERAN, null, null));
+ }
+ if (networkTypeBitmap3gpp == 0
+ || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_3G) != 0) {
+ radioAccessSpecifiers.add(
+ new RadioAccessSpecifier(AccessNetworkType.UTRAN, null, null));
+ }
+ if (networkTypeBitmap3gpp == 0
+ || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_4G) != 0) {
+ radioAccessSpecifiers.add(
+ new RadioAccessSpecifier(AccessNetworkType.EUTRAN, null, null));
+ }
+ if (networkTypeBitmap3gpp == 0
+ || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_5G) != 0) {
+ radioAccessSpecifiers.add(
+ new RadioAccessSpecifier(AccessNetworkType.NGRAN, null, null));
+ }
+
+
+ return new NetworkScanRequest(
+ NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
+ radioAccessSpecifiers.toArray(
+ new RadioAccessSpecifier[radioAccessSpecifiers.size()]),
+ SEARCH_PERIODICITY_SEC,
+ MAX_SEARCH_TIME_SEC,
+ INCREMENTAL_RESULTS,
+ INCREMENTAL_RESULTS_PERIODICITY_SEC,
+ null /* List of PLMN ids (MCC-MNC) */);
+ }
+
/**
* Request a network scan.
*
@@ -134,7 +145,7 @@
return;
}
mNetworkScanRequester = mTelephonyManager.requestNetworkScan(
- NETWORK_SCAN_REQUEST,
+ createNetworkScanForPreferredAccessNetworks(),
mExecutor,
mInternalNetworkScanCallback);
if (mNetworkScanRequester == null) {
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 138930b..e1b2138 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -37,14 +37,11 @@
import android.content.pm.ParceledListSlice;
import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.service.notification.ConversationChannelWrapper;
-import android.service.notification.NotifyingApp;
import android.text.format.DateUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
@@ -522,17 +519,17 @@
}
public Drawable getConversationDrawable(Context context, ShortcutInfo info, String pkg,
- int uid) {
+ int uid, boolean important) {
if (info == null) {
return null;
}
ConversationIconFactory iconFactory = new ConversationIconFactory(context,
context.getSystemService(LauncherApps.class),
- context.getPackageManager(), IconDrawableFactory.newInstance(context),
+ context.getPackageManager(),
+ IconDrawableFactory.newInstance(context, false),
context.getResources().getDimensionPixelSize(
R.dimen.conversation_icon_size));
- return new BitmapDrawable(context.getResources(),
- iconFactory.getConversationBitmap(info, pkg, uid));
+ return iconFactory.getConversationDrawable(info, pkg, uid, important);
}
public void requestPinShortcut(Context context, ShortcutInfo shortcutInfo) {
diff --git a/src/com/android/settings/notification/app/AppConversationListPreferenceController.java b/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
index b36c294..32278db 100644
--- a/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
@@ -127,7 +127,8 @@
conversation.getParentChannelLabel(), conversation.getGroupLabel())
: conversation.getParentChannelLabel());
if (si != null) {
- pref.setIcon(mBackend.getConversationDrawable(mContext, si, mAppRow.pkg, mAppRow.uid));
+ pref.setIcon(mBackend.getConversationDrawable(mContext, si, mAppRow.pkg, mAppRow.uid,
+ conversation.getNotificationChannel().isImportantConversation()));
}
pref.setKey(conversation.getNotificationChannel().getId());
diff --git a/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java b/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
index 369f3af..c74b032 100644
--- a/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
@@ -86,6 +86,7 @@
.setHasAppInfoLink(true)
.setRecyclerView(mFragment.getListView(), mFragment.getSettingsLifecycle())
.done(activity, mContext);
+
pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
}
}
diff --git a/src/com/android/settings/notification/app/ConversationImportantPreferenceController.java b/src/com/android/settings/notification/app/ConversationImportantPreferenceController.java
index 35e1f7d..0b1ee16 100644
--- a/src/com/android/settings/notification/app/ConversationImportantPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationImportantPreferenceController.java
@@ -74,8 +74,8 @@
mChannel.setImportantConversation(value);
if (value && bubbleImportantConversations()) {
mChannel.setAllowBubbles(true);
- mDependentFieldListener.onFieldValueChanged();
}
+ mDependentFieldListener.onFieldValueChanged();
saveChannel();
return true;
diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index 79ed28c..0ca31df 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -88,7 +88,8 @@
pref.setTitle(getTitle(conversation));
pref.setSummary(getSummary(conversation));
pref.setIcon(mBackend.getConversationDrawable(mContext, conversation.getShortcutInfo(),
- conversation.getPkg(), conversation.getUid()));
+ conversation.getPkg(), conversation.getUid(),
+ conversation.getNotificationChannel().isImportantConversation()));
pref.setKey(conversation.getNotificationChannel().getId());
pref.setIntent(getIntent(conversation, pref.getTitle()));
diff --git a/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java b/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
index 5ef9246..766e4aa 100644
--- a/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
@@ -62,7 +62,7 @@
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (mChannel == null) {
+ if (mChannel == null || !KEY.equals(preference.getKey())) {
return false;
}
mChannel.setDemoted(false);
diff --git a/src/com/android/settings/notification/app/NotificationSettings.java b/src/com/android/settings/notification/app/NotificationSettings.java
index 9d52178..af1d9c1 100644
--- a/src/com/android/settings/notification/app/NotificationSettings.java
+++ b/src/com/android/settings/notification/app/NotificationSettings.java
@@ -49,6 +49,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.notification.ConversationIconFactory;
import java.util.ArrayList;
import java.util.List;
@@ -204,7 +205,8 @@
mContext, mPkg, mUid, mChannel.getConversationId());
if (mConversationInfo != null) {
mConversationDrawable = mBackend.getConversationDrawable(
- mContext, mConversationInfo, mAppRow.pkg, mAppRow.uid);
+ mContext, mConversationInfo, mAppRow.pkg, mAppRow.uid,
+ mChannel.isImportantConversation());
}
}
@@ -329,6 +331,12 @@
protected class DependentFieldListener {
protected void onFieldValueChanged() {
+ // Reload the conversation drawable, which shows some channel/conversation state
+ if (mConversationDrawable != null && mConversationDrawable
+ instanceof ConversationIconFactory.ConversationIconDrawable) {
+ ((ConversationIconFactory.ConversationIconDrawable) mConversationDrawable)
+ .setImportant(mChannel.isImportantConversation());
+ }
final PreferenceScreen screen = getPreferenceScreen();
for (NotificationPreferenceController controller : mControllers) {
controller.displayPreference(screen);
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 9f8a07f..8c00b5d 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -236,44 +236,72 @@
};
private final NotificationListenerService mListener = new NotificationListenerService() {
+ private RecyclerView mDismissedRv;
+ private RecyclerView mSnoozedRv;
@Override
public void onListenerConnected() {
- StatusBarNotification[] snoozed = getSnoozedNotifications();
+ StatusBarNotification[] snoozed = null;
+ StatusBarNotification[] dismissed = null;
+ try {
+ snoozed = getSnoozedNotifications();
+ dismissed = mNm.getHistoricalNotifications(
+ NotificationHistoryActivity.this.getPackageName(), 6, false);
+ } catch (SecurityException | RemoteException e) {
+ Log.d(TAG, "OnPaused called while trying to retrieve notifications");
+ }
+
+ mSnoozedRv = mSnoozeView.findViewById(R.id.notification_list);
+ LinearLayoutManager lm = new LinearLayoutManager(NotificationHistoryActivity.this);
+ mSnoozedRv.setLayoutManager(lm);
+ mSnoozedRv.setAdapter(
+ new NotificationSbnAdapter(NotificationHistoryActivity.this, mPm));
+ DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(
+ mSnoozedRv.getContext(), lm.getOrientation());
+ mSnoozedRv.addItemDecoration(dividerItemDecoration);
+ mSnoozedRv.setNestedScrollingEnabled(false);
+
if (snoozed == null || snoozed.length == 0) {
mSnoozeView.setVisibility(View.GONE);
} else {
- RecyclerView rv = mSnoozeView.findViewById(R.id.notification_list);
- LinearLayoutManager lm = new LinearLayoutManager(NotificationHistoryActivity.this);
- rv.setLayoutManager(lm);
- rv.setAdapter(new NotificationSbnAdapter(NotificationHistoryActivity.this, mPm));
- DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(
- rv.getContext(), lm.getOrientation());
- rv.addItemDecoration(dividerItemDecoration);
- rv.setNestedScrollingEnabled(false);
-
- ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
+ ((NotificationSbnAdapter) mSnoozedRv.getAdapter()).onRebuildComplete(
new ArrayList<>(Arrays.asList(snoozed)));
}
- try {
- StatusBarNotification[] dismissed = mNm.getHistoricalNotifications(
- NotificationHistoryActivity.this.getPackageName(), 6, false);
- RecyclerView rv = mDismissView.findViewById(R.id.notification_list);
- LinearLayoutManager lm = new LinearLayoutManager(NotificationHistoryActivity.this);
- rv.setLayoutManager(lm);
- rv.setAdapter(new NotificationSbnAdapter(NotificationHistoryActivity.this, mPm));
- DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(
- rv.getContext(), lm.getOrientation());
- rv.addItemDecoration(dividerItemDecoration);
- rv.setNestedScrollingEnabled(false);
+ mDismissedRv = mDismissView.findViewById(R.id.notification_list);
+ LinearLayoutManager dismissLm =
+ new LinearLayoutManager(NotificationHistoryActivity.this);
+ mDismissedRv.setLayoutManager(dismissLm);
+ mDismissedRv.setAdapter(
+ new NotificationSbnAdapter(NotificationHistoryActivity.this, mPm));
+ DividerItemDecoration dismissDivider = new DividerItemDecoration(
+ mDismissedRv.getContext(), dismissLm.getOrientation());
+ mDismissedRv.addItemDecoration(dismissDivider);
+ mDismissedRv.setNestedScrollingEnabled(false);
- ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
- new ArrayList<>(Arrays.asList(dismissed)));
- mDismissView.setVisibility(View.VISIBLE);
- } catch (Exception e) {
- Slog.e(TAG, "Cannot load recently dismissed", e);
+ if (dismissed == null || dismissed.length == 0) {
mDismissView.setVisibility(View.GONE);
+ } else {
+ mDismissView.setVisibility(View.VISIBLE);
+ ((NotificationSbnAdapter) mDismissedRv.getAdapter()).onRebuildComplete(
+ new ArrayList<>(Arrays.asList(dismissed)));
+ }
+ }
+
+ @Override
+ public void onNotificationPosted(StatusBarNotification sbn) {
+ // making lint happy
+ }
+
+ @Override
+ public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,
+ int reason) {
+ if (reason == REASON_SNOOZED) {
+ ((NotificationSbnAdapter) mSnoozedRv.getAdapter()).addSbn(sbn);
+ mSnoozeView.setVisibility(View.VISIBLE);
+ } else {
+ ((NotificationSbnAdapter) mDismissedRv.getAdapter()).addSbn(sbn);
+ mDismissView.setVisibility(View.VISIBLE);
}
}
};
diff --git a/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index f1dcf47..f7a747b 100644
--- a/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -108,6 +108,14 @@
notifyDataSetChanged();
}
+ public void addSbn(StatusBarNotification sbn) {
+ if (sbn.isGroup() && sbn.getNotification().isGroupSummary()) {
+ return;
+ }
+ mValues.add(0, sbn);
+ notifyDataSetChanged();
+ }
+
private @NonNull CharSequence loadPackageName(String pkg) {
try {
ApplicationInfo info = mPm.getApplicationInfo(pkg,
diff --git a/src/com/android/settings/panel/MediaOutputPanel.java b/src/com/android/settings/panel/MediaOutputPanel.java
index 7b69fe3..6735375 100644
--- a/src/com/android/settings/panel/MediaOutputPanel.java
+++ b/src/com/android/settings/panel/MediaOutputPanel.java
@@ -186,6 +186,7 @@
@Override
public void onClickCustomizedButton() {
+ mLocalMediaManager.releaseSession();
}
@Override
diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java
index 61dee15..dd9b53c 100644
--- a/src/com/android/settings/panel/VolumePanel.java
+++ b/src/com/android/settings/panel/VolumePanel.java
@@ -48,7 +48,7 @@
@Override
public CharSequence getTitle() {
- return mContext.getText(R.string.volume_connectivity_panel_title);
+ return mContext.getText(R.string.sound_settings);
}
@Override
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 440882f..654d50b 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -135,7 +135,8 @@
*/
public EntityHeaderController setIcon(Drawable icon) {
if (icon != null) {
- mIcon = icon.getConstantState().newDrawable(mAppContext.getResources());
+ final Drawable.ConstantState state = icon.getConstantState();
+ mIcon = state != null ? state.newDrawable(mAppContext.getResources()) : icon;
}
return this;
}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index d9b9e3c..5264e10 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -82,6 +82,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
+import java.util.stream.Collectors;
/**
* The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigUiBase} to
@@ -133,6 +134,14 @@
public static final int WIFI_TTLS_PHASE2_MSCHAPV2 = 2;
public static final int WIFI_TTLS_PHASE2_GTC = 3;
+ private static final String UNDESIRED_CERTIFICATE_MACRANDSECRET = "MacRandSecret";
+ private static final String UNDESIRED_CERTIFICATE_MACRANDSAPSECRET = "MacRandSapSecret";
+ @VisibleForTesting
+ static final String[] UNDESIRED_CERTIFICATES = {
+ UNDESIRED_CERTIFICATE_MACRANDSECRET,
+ UNDESIRED_CERTIFICATE_MACRANDSAPSECRET
+ };
+
/* Phase2 methods supported by PEAP are limited */
private ArrayAdapter<CharSequence> mPhase2PeapAdapter;
/* Phase2 methods supported by TTLS are limited */
@@ -1425,7 +1434,8 @@
return KeyStore.getInstance();
}
- private void loadCertificates(
+ @VisibleForTesting
+ void loadCertificates(
Spinner spinner,
String prefix,
String noCertificateString,
@@ -1441,12 +1451,25 @@
if (showUsePreinstalledCertOption) {
certs.add(mUseSystemCertsString);
}
+
+ String[] certificateNames = null;
try {
- certs.addAll(
- Arrays.asList(getKeyStore().list(prefix, android.os.Process.WIFI_UID)));
+ certificateNames = getKeyStore().list(prefix, android.os.Process.WIFI_UID);
} catch (Exception e) {
Log.e(TAG, "can't get the certificate list from KeyStore");
}
+ if (certificateNames != null && certificateNames.length != 0) {
+ certs.addAll(Arrays.stream(certificateNames)
+ .filter(certificateName -> {
+ for (String undesired : UNDESIRED_CERTIFICATES) {
+ if (certificateName.startsWith(undesired)) {
+ return false;
+ }
+ }
+ return true;
+ }).collect(Collectors.toList()));
+ }
+
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
certs.add(noCertificateString);
}
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 8352a76..830f061 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -82,6 +82,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
+import java.util.stream.Collectors;
/**
* The class for allowing UIs like {@link WifiDialog2} and {@link WifiConfigUiBase2} to
@@ -133,6 +134,14 @@
public static final int WIFI_TTLS_PHASE2_MSCHAPV2 = 2;
public static final int WIFI_TTLS_PHASE2_GTC = 3;
+ private static final String UNDESIRED_CERTIFICATE_MACRANDSECRET = "MacRandSecret";
+ private static final String UNDESIRED_CERTIFICATE_MACRANDSAPSECRET = "MacRandSapSecret";
+ @VisibleForTesting
+ static final String[] UNDESIRED_CERTIFICATES = {
+ UNDESIRED_CERTIFICATE_MACRANDSECRET,
+ UNDESIRED_CERTIFICATE_MACRANDSAPSECRET
+ };
+
/* Phase2 methods supported by PEAP are limited */
private ArrayAdapter<CharSequence> mPhase2PeapAdapter;
/* Phase2 methods supported by TTLS are limited */
@@ -1421,7 +1430,8 @@
return KeyStore.getInstance();
}
- private void loadCertificates(
+ @VisibleForTesting
+ void loadCertificates(
Spinner spinner,
String prefix,
String noCertificateString,
@@ -1437,11 +1447,25 @@
if (showUsePreinstalledCertOption) {
certs.add(mUseSystemCertsString);
}
+
+ String[] certificateNames = null;
try {
- certs.addAll(Arrays.asList(getKeyStore().list(prefix, android.os.Process.WIFI_UID)));
+ certificateNames = getKeyStore().list(prefix, android.os.Process.WIFI_UID);
} catch (Exception e) {
Log.e(TAG, "can't get the certificate list from KeyStore");
}
+ if (certificateNames != null && certificateNames.length != 0) {
+ certs.addAll(Arrays.stream(certificateNames)
+ .filter(certificateName -> {
+ for (String undesired : UNDESIRED_CERTIFICATES) {
+ if (certificateName.startsWith(undesired)) {
+ return false;
+ }
+ }
+ return true;
+ }).collect(Collectors.toList()));
+ }
+
if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
certs.add(noCertificateString);
}
diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
index 05c7b4e..7a5677f 100644
--- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
+++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
@@ -349,7 +349,7 @@
* If specified is passpoint network, need to check with the existing passpoint
* networks.
*/
- final PasspointConfiguration passpointConfig = suggestion.getPasspointConfiguration();
+ final PasspointConfiguration passpointConfig = suggestion.getPasspointConfig();
if (passpointConfig != null) {
foundInSavedList = isSavedPasspointConfiguration(passpointConfig);
displayedName = passpointConfig.getHomeSp().getFriendlyName();
@@ -600,7 +600,7 @@
*/
private void saveNetwork(int index) {
final PasspointConfiguration passpointConfig =
- mUiToRequestedList.get(index).mWifiNetworkSuggestion.getPasspointConfiguration();
+ mUiToRequestedList.get(index).mWifiNetworkSuggestion.getPasspointConfig();
if (passpointConfig != null) {
// Save passpoint, if no IllegalArgumentException, then treat it as success.
try {
diff --git a/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java b/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java
index f1c24c3..fc7b5ce 100644
--- a/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java
@@ -51,11 +51,8 @@
@Override
public int getAvailabilityStatus() {
- if (!WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry)
- || mWifiEntry.canManageSubscription()) {
- return CONDITIONALLY_UNAVAILABLE;
- }
- return AVAILABLE;
+ return WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry) ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index c12f8d3..803b828 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -145,7 +145,6 @@
static final String KEY_IPV6_CATEGORY = "ipv6_category";
@VisibleForTesting
static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
- static final String KEY_IP_DETAILS_CATEGORY = "ip_details_category";
private final WifiEntry mWifiEntry;
private final ConnectivityManager mConnectivityManager;
@@ -165,7 +164,6 @@
private ActionButtonsPreference mButtonsPref;
private EntityHeaderController mEntityHeaderController;
private Preference mSignalStrengthPref;
- private PreferenceCategory mIpDetailsCategory;
private Preference mTxLinkSpeedPref;
private Preference mRxLinkSpeedPref;
private Preference mFrequencyPref;
@@ -196,9 +194,7 @@
mLinkProperties = lp;
refreshEntityHeader();
refreshButtons();
- if (!mWifiEntry.canManageSubscription()) {
- refreshIpLayerInfo();
- }
+ refreshIpLayerInfo();
}
}
@@ -238,9 +234,7 @@
}
mNetworkCapabilities = nc;
refreshButtons();
- if (!mWifiEntry.canManageSubscription()) {
- refreshIpLayerInfo();
- }
+ refreshIpLayerInfo();
}
}
@@ -335,7 +329,6 @@
updateCaptivePortalButton();
mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
- mIpDetailsCategory = screen.findPreference(KEY_IP_DETAILS_CATEGORY);
mTxLinkSpeedPref = screen.findPreference(KEY_TX_LINK_SPEED);
mRxLinkSpeedPref = screen.findPreference(KEY_RX_LINK_SPEED);
mFrequencyPref = screen.findPreference(KEY_FREQUENCY_PREF);
@@ -351,13 +344,6 @@
mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
- if (mWifiEntry.canManageSubscription()) {
- mIpDetailsCategory.setVisible(false);
- mIpv6Category.setVisible(false);
- mSignalStrengthPref.setVisible(false);
- mFrequencyPref.setVisible(false);
- mSecurityPref.setVisible(false);
- }
mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
}
@@ -505,16 +491,10 @@
// refresh header
refreshEntityHeader();
- refreshEntityHeaderIcon();
+
// refresh Buttons
refreshButtons();
- // When support manage subscription, there won't have any detail information, so don't
- // need to update those detail UIs.
- if (mWifiEntry.canManageSubscription()) {
- return;
- }
-
// Update Connection Header icon and Signal Strength Preference
refreshRssiViews();
// Frequency Pref
@@ -531,11 +511,7 @@
refreshMacAddress();
}
- private void refreshEntityHeaderIcon() {
- if (mEntityHeaderController == null) {
- return;
- }
-
+ private void refreshRssiViews() {
int signalLevel = mWifiEntry.getLevel();
// Disappears signal view if not in range. e.g. for saved networks.
@@ -550,23 +526,13 @@
}
mRssiSignalLevel = signalLevel;
Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
- mEntityHeaderController
- .setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
- true /* rebind */);
- }
- private void refreshRssiViews() {
- int signalLevel = mWifiEntry.getLevel();
-
- // Disappears signal view if not in range. e.g. for saved networks.
- if (signalLevel == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
- mSignalStrengthPref.setVisible(false);
- mRssiSignalLevel = -1;
- return;
+ if (mEntityHeaderController != null) {
+ mEntityHeaderController
+ .setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
+ true /* rebind */);
}
- mRssiSignalLevel = signalLevel;
- Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
mSignalStrengthPref.setIcon(wifiIconDark);
diff --git a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
index df205a3..b4909e2 100644
--- a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
@@ -55,7 +55,7 @@
@Override
public int getAvailabilityStatus() {
- return mWifiEntry.canManageSubscription() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
+ return AVAILABLE;
}
@Override
diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
index a11cadf..07bd5a4 100644
--- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
+++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
@@ -115,10 +115,6 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- if (mNetworkDetailsTracker.getWifiEntry().canManageSubscription()) {
- return;
- }
-
MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify);
item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index 479848c..b87b05d 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -55,11 +55,8 @@
@Override
public int getAvailabilityStatus() {
- if (!mWifiManager.isConnectedMacRandomizationSupported()
- || mWifiEntry.canManageSubscription()) {
- return CONDITIONALLY_UNAVAILABLE;
- }
- return AVAILABLE;
+ return mWifiManager.isConnectedMacRandomizationSupported()
+ ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2.java
index 7c93327..2598fb3 100644
--- a/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2.java
@@ -41,11 +41,7 @@
@Override
public int getAvailabilityStatus() {
- if (mWifiEntry.canManageSubscription()) {
- return AVAILABLE;
- }
-
- return CONDITIONALLY_UNAVAILABLE;
+ return mWifiEntry.canManageSubscription() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java
index 5ac5bad..63c7da1 100644
--- a/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/HtmlTextPreferenceTest.java
@@ -23,7 +23,6 @@
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
-import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
@@ -36,9 +35,6 @@
import org.robolectric.RuntimeEnvironment;
import org.xml.sax.XMLReader;
-import java.util.ArrayList;
-import java.util.List;
-
/** Tests for {@link HtmlTextPreference} */
@RunWith(RobolectricTestRunner.class)
public final class HtmlTextPreferenceTest {
@@ -65,21 +61,13 @@
}
@Test
- public void testUnsupportedTagList_keepRealContentWithoutTag() {
- final List<String> testUnsupportedTagList = new ArrayList<>();
- testUnsupportedTagList.add("testTag");
+ public void testTagHandler() {
final String testStr = "<testTag>Real description</testTag>";
- final String expectedStr = "Real description";
- final String expectedTag = "unsupportedtag1";
- mHtmlTextPreference.setUnsupportedTagList(testUnsupportedTagList);
mHtmlTextPreference.setSummary(testStr);
mHtmlTextPreference.setTagHandler(mTagHandler);
mHtmlTextPreference.onBindViewHolder(mPreferenceViewHolder);
- final TextView summaryView = mPreferenceViewHolder.itemView.findViewById(
- android.R.id.summary);
- assertThat(summaryView.getText().toString()).isEqualTo(expectedStr);
- assertThat(mHandledTag).isEqualTo(expectedTag);
+ assertThat(mHandledTag).isEqualTo("testTag");
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
deleted file mode 100644
index 3ae0e75..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 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.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-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 ShortcutServicePickerFragmentTest {
-
- private static final String TEST_SERVICE_KEY_1 = "abc/123";
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Activity mActivity;
- @Mock
- private UserManager mUserManager;
-
- private ShortcutServicePickerFragment mFragment;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- FakeFeatureFactory.setupForTest();
- when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
- mFragment = spy(new ShortcutServicePickerFragment());
- mFragment.onAttach(mActivity);
-
- doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
- }
-
- @Test
- public void setAndGetDefaultAppKey_shouldUpdateDefaultAppKey() {
- assertThat(mFragment.setDefaultKey(TEST_SERVICE_KEY_1)).isTrue();
- assertThat(mFragment.getDefaultKey()).isEqualTo(TEST_SERVICE_KEY_1);
- }
-}
-
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index 9aca92e..e4f5b1f 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -38,6 +38,7 @@
import android.widget.Spinner;
import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
import androidx.preference.PreferenceManager;
import com.android.settings.R;
@@ -71,6 +72,8 @@
private MobileDataEnabledListener mMobileDataEnabledListener;
@Mock
private TemplatePreference.NetworkServices mNetworkServices;
+ @Mock
+ private LoaderManager mLoaderManager;
private Activity mActivity;
private DataUsageList mDataUsageList;
@@ -90,6 +93,7 @@
ReflectionHelpers.setField(mDataUsageList, "mDataStateListener",
mMobileDataEnabledListener);
ReflectionHelpers.setField(mDataUsageList, "services", mNetworkServices);
+ doReturn(mLoaderManager).when(mDataUsageList).getLoaderManager();
}
@Test
@@ -216,6 +220,14 @@
assertThat(spinner.getVisibility()).isEqualTo(View.VISIBLE);
}
+ @Test
+ public void onPause_shouldDestroyLoaders() {
+ mDataUsageList.onPause();
+
+ verify(mLoaderManager).destroyLoader(DataUsageList.LOADER_CHART_DATA);
+ verify(mLoaderManager).destroyLoader(DataUsageList.LOADER_SUMMARY);
+ }
+
private View getHeader() {
final View rootView = LayoutInflater.from(mActivity)
.inflate(R.layout.preference_list_fragment, null, false);
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
index 366a18d..920e9d1 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
@@ -82,6 +82,8 @@
mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
mController = new GraphicsDriverEnableForAllAppsPreferenceController(mContext, "testKey");
+ mController.mEntryList = mContext.getResources().getStringArray(
+ R.array.graphics_driver_all_apps_preference_values);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index 7ad8d63..2fb2a3d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -142,6 +142,37 @@
verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
}
+
+ @Test
+ public void populateImeiInfo_cdmaSimPresent_shouldSetImeiInfoAndSetAllCdmaSetting() {
+ ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
+ when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+ when(mTelephonyManager.getSimState(anyInt())).thenReturn(
+ TelephonyManager.SIM_STATE_PRESENT);
+
+ mController.populateImeiInfo();
+
+ verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
+ verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");
+ verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");
+ verify(mDialog).setText(eq(ID_IMEI_VALUE), any());
+ verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any());
+ }
+
+ @Test
+ public void populateImeiInfo_cdmaSimABSENT_shouldSetImeiInfoAndSetAllCdmaSetting() {
+ ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
+ when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+ when(mTelephonyManager.getSimState(anyInt())).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
+
+ mController.populateImeiInfo();
+
+ verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
+ verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");
+ verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");
+ verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
+ }
+
@Test
public void populateImeiInfo_gsmSimDisabled_shouldSetImeiAndRemoveCdmaSettings() {
ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
index 3b5e828..7097889 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
@@ -17,16 +17,26 @@
package com.android.settings.media;
+import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothManager;
import android.content.Context;
+import android.content.Intent;
import android.media.AudioManager;
+import android.media.session.MediaController;
+import android.media.session.MediaSession;
+import android.net.Uri;
+import android.os.Process;
+import android.text.TextUtils;
import androidx.slice.Slice;
import androidx.slice.SliceMetadata;
@@ -34,33 +44,42 @@
import androidx.slice.widget.SliceLiveData;
import com.android.settings.R;
+import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.media.MediaOutputSliceConstants;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowBluetoothUtils.class})
+@Config(shadows = {ShadowBluetoothUtils.class,
+ MediaOutputIndicatorSliceTest.ShadowSliceBackgroundWorker.class})
public class MediaOutputIndicatorSliceTest {
private static final String TEST_A2DP_DEVICE_NAME = "Test_A2DP_BT_Device_NAME";
private static final String TEST_HAP_DEVICE_NAME = "Test_HAP_BT_Device_NAME";
private static final String TEST_A2DP_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
private static final String TEST_HAP_DEVICE_ADDRESS = "00:B2:B2:B2:B2:B2";
+ private static final String TEST_PACKAGE_NAME = "com.test";
+
+ private static MediaOutputIndicatorWorker sMediaOutputIndicatorWorker;
@Mock
private A2dpProfile mA2dpProfile;
@@ -70,6 +89,8 @@
private LocalBluetoothManager mLocalBluetoothManager;
@Mock
private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
+ @Mock
+ private MediaController mMediaController;
private BluetoothAdapter mBluetoothAdapter;
private BluetoothDevice mA2dpDevice;
@@ -79,6 +100,7 @@
private List<BluetoothDevice> mDevicesList;
private MediaOutputIndicatorSlice mMediaOutputIndicatorSlice;
private AudioManager mAudioManager;
+ private MediaSession.Token mToken;
@Before
public void setUp() throws Exception {
@@ -86,9 +108,11 @@
mContext = spy(RuntimeEnvironment.application);
mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
mAudioManager.setMode(AudioManager.MODE_NORMAL);
+ sMediaOutputIndicatorWorker = spy(new MediaOutputIndicatorWorker(mContext,
+ MEDIA_OUTPUT_INDICATOR_SLICE_URI));
+ mToken = new MediaSession.Token(Process.myUid(), null);
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-
// Setup Bluetooth environment
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
mBluetoothManager = new BluetoothManager(mContext);
@@ -196,4 +220,45 @@
final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
assertThat(metadata.isErrorSlice()).isTrue();
}
+
+ @Test
+ public void onNotifyChange_withActiveLocalMedia_verifyIntentExtra() {
+ when(mMediaController.getSessionToken()).thenReturn(mToken);
+ when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
+ doReturn(mMediaController).when(sMediaOutputIndicatorWorker)
+ .getActiveLocalMediaController();
+
+ final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ mMediaOutputIndicatorSlice.onNotifyChange(new Intent());
+ verify(mContext).startActivity(intentCaptor.capture());
+
+ assertThat(TextUtils.equals(TEST_PACKAGE_NAME, intentCaptor.getValue().getStringExtra(
+ MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue();
+ assertThat(mToken == intentCaptor.getValue().getExtras().getParcelable(
+ MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN)).isTrue();
+ }
+
+ @Test
+ public void onNotifyChange_withoutActiveLocalMedia_verifyIntentExtra() {
+ doReturn(mMediaController).when(sMediaOutputIndicatorWorker)
+ .getActiveLocalMediaController();
+
+ final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ mMediaOutputIndicatorSlice.onNotifyChange(new Intent());
+ verify(mContext).startActivity(intentCaptor.capture());
+
+ assertThat(TextUtils.isEmpty(intentCaptor.getValue().getStringExtra(
+ MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue();
+ assertThat(intentCaptor.getValue().getExtras().getParcelable(
+ MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN) == null).isTrue();
+ }
+
+ @Implements(SliceBackgroundWorker.class)
+ public static class ShadowSliceBackgroundWorker {
+
+ @Implementation
+ public static SliceBackgroundWorker getInstance(Uri uri) {
+ return sMediaOutputIndicatorWorker;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
index 78658fd..b6231a3 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
@@ -16,6 +16,8 @@
package com.android.settings.media;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -28,7 +30,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.media.AudioAttributes;
import android.media.AudioManager;
+import android.media.VolumeProvider;
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
+import android.media.session.PlaybackState;
import android.net.Uri;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
@@ -45,6 +52,9 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothUtils.class})
public class MediaOutputIndicatorWorkerTest {
@@ -54,10 +64,18 @@
private BluetoothEventManager mBluetoothEventManager;
@Mock
private LocalBluetoothManager mLocalBluetoothManager;
+ @Mock
+ private MediaSessionManager mMediaSessionManager;
+ @Mock
+ private MediaController mMediaController;
+
private Context mContext;
- private MediaOutputIndicatorWorker mMediaDeviceUpdateWorker;
+ private MediaOutputIndicatorWorker mMediaOutputIndicatorWorker;
private ShadowApplication mShadowApplication;
private ContentResolver mResolver;
+ private List<MediaController> mMediaControllers = new ArrayList<>();
+ private PlaybackState mPlaybackState;
+ private MediaController.PlaybackInfo mPlaybackInfo;
@Before
public void setUp() {
@@ -66,7 +84,10 @@
mContext = spy(RuntimeEnvironment.application);
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
- mMediaDeviceUpdateWorker = new MediaOutputIndicatorWorker(mContext, URI);
+ mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI);
+ when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
+ mMediaControllers.add(mMediaController);
+ when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
mResolver = mock(ContentResolver.class);
doReturn(mResolver).when(mContext).getContentResolver();
@@ -74,22 +95,22 @@
@Test
public void onSlicePinned_registerCallback() {
- mMediaDeviceUpdateWorker.onSlicePinned();
- verify(mBluetoothEventManager).registerCallback(mMediaDeviceUpdateWorker);
+ mMediaOutputIndicatorWorker.onSlicePinned();
+ verify(mBluetoothEventManager).registerCallback(mMediaOutputIndicatorWorker);
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
}
@Test
public void onSliceUnpinned_unRegisterCallback() {
- mMediaDeviceUpdateWorker.onSlicePinned();
- mMediaDeviceUpdateWorker.onSliceUnpinned();
- verify(mBluetoothEventManager).unregisterCallback(mMediaDeviceUpdateWorker);
+ mMediaOutputIndicatorWorker.onSlicePinned();
+ mMediaOutputIndicatorWorker.onSliceUnpinned();
+ verify(mBluetoothEventManager).unregisterCallback(mMediaOutputIndicatorWorker);
verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
}
@Test
public void onReceive_shouldNotifyChange() {
- mMediaDeviceUpdateWorker.onSlicePinned();
+ mMediaOutputIndicatorWorker.onSlicePinned();
final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) {
@@ -98,4 +119,62 @@
verify(mResolver).notifyChange(URI, null);
}
+
+ @Test
+ public void getActiveLocalMediaController_localMediaPlaying_returnController() {
+ mPlaybackInfo = new MediaController.PlaybackInfo(
+ MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL,
+ VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+ 100,
+ 10,
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+ null);
+ mPlaybackState = new PlaybackState.Builder()
+ .setState(PlaybackState.STATE_PLAYING, 0, 1)
+ .build();
+
+ when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+ when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+
+ assertThat(mMediaOutputIndicatorWorker.getActiveLocalMediaController()).isEqualTo(
+ mMediaController);
+ }
+
+ @Test
+ public void getActiveLocalMediaController_remoteMediaPlaying_returnNull() {
+ mPlaybackInfo = new MediaController.PlaybackInfo(
+ MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
+ VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+ 100,
+ 10,
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+ null);
+ mPlaybackState = new PlaybackState.Builder()
+ .setState(PlaybackState.STATE_PLAYING, 0, 1)
+ .build();
+
+ when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+ when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+
+ assertThat(mMediaOutputIndicatorWorker.getActiveLocalMediaController()).isNull();
+ }
+
+ @Test
+ public void getActiveLocalMediaController_localMediaStopped_returnNull() {
+ mPlaybackInfo = new MediaController.PlaybackInfo(
+ MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL,
+ VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+ 100,
+ 10,
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+ null);
+ mPlaybackState = new PlaybackState.Builder()
+ .setState(PlaybackState.STATE_STOPPED, 0, 1)
+ .build();
+
+ when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+ when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+
+ assertThat(mMediaOutputIndicatorWorker.getActiveLocalMediaController()).isNull();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
index adbd14d..f71c090 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
@@ -44,6 +44,7 @@
import androidx.slice.core.SliceQuery;
import androidx.slice.widget.SliceLiveData;
+import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.media.LocalMediaManager;
import com.android.settingslib.media.MediaDevice;
@@ -156,6 +157,26 @@
}
@Test
+ public void getSlice_disconnectedBluetooth_verifyTitle() {
+ mDevices.clear();
+ final MediaDevice device = mock(MediaDevice.class);
+ when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
+ when(device.getIcon()).thenReturn(mTestDrawable);
+ when(device.getMaxVolume()).thenReturn(100);
+ when(device.isConnected()).thenReturn(false);
+
+ mDevices.add(device);
+ mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
+
+ final Slice mediaSlice = mMediaOutputSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
+
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ assertThat(primaryAction.getTitle().toString()).isEqualTo(TEST_DEVICE_1_NAME + " ("
+ + mContext.getText(R.string.media_output_disconnected_status) + ")");
+ }
+
+ @Test
public void onNotifyChange_foundMediaDevice_connect() {
mDevices.clear();
final MediaDevice device = mock(MediaDevice.class);
diff --git a/tests/robotests/src/com/android/settings/network/DataDuringCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/DataDuringCallsPreferenceControllerTest.java
index a42420c..d366dfd 100644
--- a/tests/robotests/src/com/android/settings/network/DataDuringCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/DataDuringCallsPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.google.common.truth.Truth.assertThat;
@@ -131,4 +132,24 @@
assertThat(mController.isAvailable()).isTrue();
assertThat(mSwitchPreference.isVisible()).isTrue();
}
+
+ @Test
+ public void getAvailabilityStatus_mobileDataChangWithDefaultDataSubId_returnUnavailable() {
+ ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
+
+ mController.refreshPreference();
+
+ assertThat(mController.getAvailabilityStatus(SUB_ID_1))
+ .isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_mobileDataChangWithoutDefaultDataSubId_returnAvailable() {
+ ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_1);
+
+ mController.displayPreference(mPreferenceScreen);
+ mController.refreshPreference();
+
+ assertThat(mController.getAvailabilityStatus(SUB_ID_2)).isEqualTo(AVAILABLE);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationImportantPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationImportantPreferenceControllerTest.java
index 783b40f..42b7859 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationImportantPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationImportantPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -156,7 +155,7 @@
assertTrue(channel.isImportantConversation());
assertFalse(channel.canBubble());
verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
- verify(mDependentFieldListener, never()).onFieldValueChanged();
+ verify(mDependentFieldListener, times(1)).onFieldValueChanged();
}
@Test
@@ -202,6 +201,6 @@
assertFalse(channel.isImportantConversation());
assertFalse(channel.canBubble());
verify(mBackend, times(1)).updateChannel(any(), anyInt(), any());
- verify(mDependentFieldListener, never()).onFieldValueChanged();
+ verify(mDependentFieldListener, times(1)).onFieldValueChanged();
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java
index 725be3d..9b60c97 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationPromotePreferenceControllerTest.java
@@ -20,9 +20,11 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -122,4 +124,20 @@
verify(mFragment).getActivity();
}
+
+ @Test
+ public void testHandlePreferenceClick_wrongKey() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
+ channel.setConversationId("a", "a");
+ channel.setDemoted(true);
+ mController.onResume(appRow, channel, null, null, null, null);
+
+ Preference pref = mock(Preference.class);
+ when(pref.getKey()).thenReturn("wrong");
+ assertFalse(mController.handlePreferenceTreeClick(pref));
+
+ verify(mBackend, never()).updateChannel(eq(null), anyInt(), any());
+ verify(mFragment, never()).getActivity();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
index a4c94ca..ea77485 100644
--- a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
@@ -236,4 +236,11 @@
assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
}
+
+ @Test
+ public void onClickCustomizedButton_shouldReleaseSession() {
+ mPanel.onClickCustomizedButton();
+
+ verify(mLocalMediaManager).releaseSession();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index e0dc97f..c9bc346 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -241,6 +241,20 @@
}
@Test
+ public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
+ final Spinner spinner = new Spinner(mContext);
+ when(mKeyStore.list(anyString())).thenReturn(WifiConfigController.UNDESIRED_CERTIFICATES);
+
+ mController.loadCertificates(spinner,
+ "prefix",
+ "doNotProvideEapUserCertString",
+ false /* showMultipleCerts */,
+ false /* showUsePreinstalledCertOption */);
+
+ assertThat(spinner.getAdapter().getCount()).isEqualTo(1); // doNotProvideEapUserCertString
+ }
+
+ @Test
public void ssidGetFocus_addNewNetwork_shouldReturnTrue() {
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
WifiConfigUiBase2.MODE_CONNECT);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 3a17b6c..9146998 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -241,6 +241,20 @@
}
@Test
+ public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
+ final Spinner spinner = new Spinner(mContext);
+ when(mKeyStore.list(anyString())).thenReturn(WifiConfigController.UNDESIRED_CERTIFICATES);
+
+ mController.loadCertificates(spinner,
+ "prefix",
+ "doNotProvideEapUserCertString",
+ false /* showMultipleCerts */,
+ false /* showUsePreinstalledCertOption */);
+
+ assertThat(spinner.getAdapter().getCount()).isEqualTo(1); // doNotProvideEapUserCertString
+ }
+
+ @Test
public void ssidGetFocus_addNewNetwork_shouldReturnTrue() {
mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
WifiConfigUiBase.MODE_CONNECT);