Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d3c207..2bf356f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2239,9 +2239,6 @@
<intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
- <meta-data android:name="com.android.settings.order" android:value="-6"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.wireless" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.datausage.DataUsageSummary" />
</activity>
diff --git a/res/drawable/ic_settings_sign_in.xml b/res/drawable/ic_settings_sign_in.xml
new file mode 100644
index 0000000..e2fa5d8
--- /dev/null
+++ b/res/drawable/ic_settings_sign_in.xml
@@ -0,0 +1,24 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5-5L11,7z M20,19h-8v2h8c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2h-8v2h8V19z"/>
+</vector>
diff --git a/res/layout/homepage_condition_footer.xml b/res/layout/conditional_card_footer.xml
similarity index 100%
rename from res/layout/homepage_condition_footer.xml
rename to res/layout/conditional_card_footer.xml
diff --git a/res/layout/homepage_condition_full_tile.xml b/res/layout/conditional_card_full_tile.xml
similarity index 100%
rename from res/layout/homepage_condition_full_tile.xml
rename to res/layout/conditional_card_full_tile.xml
diff --git a/res/layout/homepage_condition_half_tile.xml b/res/layout/conditional_card_half_tile.xml
similarity index 100%
rename from res/layout/homepage_condition_half_tile.xml
rename to res/layout/conditional_card_half_tile.xml
diff --git a/res/layout/homepage_condition_header.xml b/res/layout/conditional_card_header.xml
similarity index 100%
rename from res/layout/homepage_condition_header.xml
rename to res/layout/conditional_card_header.xml
diff --git a/res/layout/homepage_condition_header_icon.xml b/res/layout/conditional_card_header_icon.xml
similarity index 100%
rename from res/layout/homepage_condition_header_icon.xml
rename to res/layout/conditional_card_header_icon.xml
diff --git a/res/layout/homepage_dismissal_view.xml b/res/layout/contextual_card_dismissal_view.xml
similarity index 100%
rename from res/layout/homepage_dismissal_view.xml
rename to res/layout/contextual_card_dismissal_view.xml
diff --git a/res/layout/homepage_slice_deferred_setup_tile.xml b/res/layout/contextual_slice_deferred_setup.xml
similarity index 100%
rename from res/layout/homepage_slice_deferred_setup_tile.xml
rename to res/layout/contextual_slice_deferred_setup.xml
diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/contextual_slice_full_tile.xml
similarity index 95%
rename from res/layout/homepage_slice_tile.xml
rename to res/layout/contextual_slice_full_tile.xml
index 9e8a86c..8b1ac58 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/contextual_slice_full_tile.xml
@@ -36,7 +36,7 @@
android:importantForAccessibility="no"/>
<!--dismissal view-->
- <include layout="@layout/homepage_dismissal_view"/>
+ <include layout="@layout/contextual_card_dismissal_view"/>
</FrameLayout>
</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/res/layout/homepage_slice_half_tile.xml b/res/layout/contextual_slice_half_tile.xml
similarity index 97%
rename from res/layout/homepage_slice_half_tile.xml
rename to res/layout/contextual_slice_half_tile.xml
index dc08585..f0cad21 100644
--- a/res/layout/homepage_slice_half_tile.xml
+++ b/res/layout/contextual_slice_half_tile.xml
@@ -57,7 +57,7 @@
</LinearLayout>
<!--dismissal view-->
- <include layout="@layout/homepage_dismissal_view"/>
+ <include layout="@layout/contextual_card_dismissal_view"/>
</FrameLayout>
</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/res/layout/homepage_suggestion_tile.xml b/res/layout/legacy_suggestion_tile.xml
similarity index 100%
rename from res/layout/homepage_suggestion_tile.xml
rename to res/layout/legacy_suggestion_tile.xml
diff --git a/res/values/config.xml b/res/values/config.xml
index cdf2810..496b5d2 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -47,6 +47,8 @@
<!-- Package name and fully-qualified class name for the wallpaper picker activity. -->
<string name="config_wallpaper_picker_package" translatable="false">com.android.settings</string>
<string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string>
+ <!-- Fully-qualified class name for the styles & wallpaper picker activity. -->
+ <string name="config_styles_and_wallpaper_picker_class" translatable="false"></string>
<!-- Manufacturer backup settings to launch -->
<string name="config_backup_settings_intent" translatable="false"></string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b07865c..ff970c3 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -395,4 +395,7 @@
<dimen name="bt_icon_elevation">4dp</dimen>
<dimen name="two_target_min_width">80dp</dimen>
+
+ <!-- Maximum height for SliceView, override on slices/view/src/main/res/values/dimens.xml -->
+ <dimen name="abc_slice_large_height">360dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7180a0f..d9d95b9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3863,6 +3863,8 @@
<string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
<!-- Description text for Bluetooth always scanning -->
<string name="location_scanning_bluetooth_always_scanning_description">Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.</string>
+ <!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->
+ <string name="managed_profile_location_services">Location services for work</string>
<!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
<string name="location_network_based">Wi\u2011Fi & mobile network location</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8c3a633..9ce8af0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -537,6 +537,8 @@
<style name="SetupWizardPartnerResource">
<!-- Disable to use partner overlay theme for outside setupwizard flow. -->
<item name="sucUsePartnerResource">false</item>
+ <!-- Enable heavy theme style inside setupwizard flow. -->
+ <item name="sudUsePartnerHeavyTheme">true</item>
</style>
</resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 940e6de..a612a47 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -53,9 +53,6 @@
settings:keywords="@string/keywords_display_wallpaper"
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.display.WallpaperPreferenceController">
- <intent
- android:targetPackage="@string/config_wallpaper_picker_package"
- android:targetClass="@string/config_wallpaper_picker_class" />
</com.android.settingslib.RestrictedPreference>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 29d4048..2f43ce8 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -55,6 +55,12 @@
<PreferenceCategory
android:key="location_services" />
+
+ <!-- This preference gets removed if there is no managed profile -->
+ <PreferenceCategory
+ android:title="@string/managed_profile_location_services"
+ android:key="location_services_managed_profile" />
+
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/mobile_network_settings_v2.xml b/res/xml/mobile_network_settings_v2.xml
index 4c7de5a..e7cc1dc 100644
--- a/res/xml/mobile_network_settings_v2.xml
+++ b/res/xml/mobile_network_settings_v2.xml
@@ -68,6 +68,11 @@
android:title="@string/mobile_data_usage_title"
settings:controller="com.android.settings.network.telephony.DataUsagePreferenceController"/>
+ <com.android.settings.datausage.BillingCyclePreference
+ android:key="billing_preference"
+ android:title="@string/billing_cycle"
+ settings:controller="com.android.settings.datausage.BillingCyclePreferenceController" />
+
<SwitchPreference
android:key="enhanced_4g_lte"
android:title="@string/enhanced_4g_lte_mode_title"
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index c218869..32b51d4 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -64,7 +64,7 @@
settings:useAdminDisabledSummary="true" />
<com.android.settingslib.RestrictedSwitchPreference
- android:key="airplane_mode"
+ android:key="airplane_mode_old"
android:title="@string/airplane_mode"
android:icon="@drawable/ic_airplanemode_active"
android:disableDependentsState="true"
diff --git a/res/xml/network_and_internet_v2.xml b/res/xml/network_and_internet_v2.xml
index 0d9e2ea..3604480 100644
--- a/res/xml/network_and_internet_v2.xml
+++ b/res/xml/network_and_internet_v2.xml
@@ -19,7 +19,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="network_and_internet_screen"
android:title="@string/network_dashboard_title"
- settings:initialExpandedChildrenCount="6">
+ settings:initialExpandedChildrenCount="5">
<PreferenceCategory
android:key="multi_network_header"
@@ -53,7 +53,7 @@
settings:useAdminDisabledSummary="true" />
<com.android.settingslib.RestrictedSwitchPreference
- android:key="toggle_airplane"
+ android:key="airplane_mode"
android:title="@string/airplane_mode"
android:icon="@drawable/ic_airplanemode_active"
android:disableDependentsState="true"
diff --git a/src/com/android/settings/datausage/BillingCyclePreferenceController.java b/src/com/android/settings/datausage/BillingCyclePreferenceController.java
new file mode 100644
index 0000000..0220a12
--- /dev/null
+++ b/src/com/android/settings/datausage/BillingCyclePreferenceController.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2019 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.datausage;
+
+import android.content.Context;
+import android.net.INetworkStatsService;
+import android.net.NetworkPolicyManager;
+import android.net.NetworkTemplate;
+import android.os.INetworkManagementService;
+import android.os.ServiceManager;
+import android.os.UserManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.NetworkPolicyEditor;
+
+import androidx.preference.PreferenceScreen;
+
+public class BillingCyclePreferenceController extends BasePreferenceController {
+ private int mSubscriptionId;
+
+ public BillingCyclePreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ public void init(int subscriptionId) {
+ mSubscriptionId = subscriptionId;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ BillingCyclePreference preference = screen.findPreference(getPreferenceKey());
+
+ TemplatePreference.NetworkServices services = new TemplatePreference.NetworkServices();
+ services.mNetworkService = INetworkManagementService.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
+ services.mStatsService = INetworkStatsService.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+ services.mPolicyManager = mContext.getSystemService(NetworkPolicyManager.class);
+ services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
+ services.mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+ services.mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
+ services.mUserManager = mContext.getSystemService(UserManager.class);
+
+ NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
+ services.mTelephonyManager.getSubscriberId(mSubscriptionId));
+ NetworkTemplate template = NetworkTemplate.normalize(mobileAll,
+ services.mTelephonyManager.getMergedSubscriberIds());
+
+ preference.setTemplate(template, mSubscriptionId, services);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index a24f82b..e791168 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -150,8 +150,6 @@
mInternalCategory.addPreference(mInternalSummary);
- int privateCount = 0;
-
final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(mStorageManager);
final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(smvp);
final long privateTotalBytes = info.totalBytes;
@@ -162,10 +160,16 @@
for (VolumeInfo vol : volumes) {
if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
- final long volumeTotalBytes = PrivateStorageInfo.getTotalSize(vol,
- sTotalInternalStorage);
- mInternalCategory.addPreference(
- new StorageVolumePreference(context, vol, volumeTotalBytes));
+
+ if (vol.getState() == VolumeInfo.STATE_UNMOUNTABLE) {
+ mInternalCategory.addPreference(
+ new StorageVolumePreference(context, vol, 0));
+ } else {
+ final long volumeTotalBytes = PrivateStorageInfo.getTotalSize(vol,
+ sTotalInternalStorage);
+ mInternalCategory.addPreference(
+ new StorageVolumePreference(context, vol, volumeTotalBytes));
+ }
} else if (vol.getType() == VolumeInfo.TYPE_PUBLIC
|| vol.getType() == VolumeInfo.TYPE_STUB) {
mExternalCategory.addPreference(
diff --git a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
index ed85a4a..fbaea93 100644
--- a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
+++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -36,11 +36,15 @@
@Override
public CharSequence getSummary() {
- if (new WallpaperPreferenceController(mContext, "dummy_key").isAvailable()) {
- return mContext.getText(R.string.display_dashboard_summary);
+ final WallpaperPreferenceController controller =
+ new WallpaperPreferenceController(mContext, "dummy_key");
+ if (controller.isAvailable()) {
+ return mContext.getText(
+ controller.areStylesAvailable()
+ ? R.string.display_dashboard_summary_with_style
+ : R.string.display_dashboard_summary);
} else {
return mContext.getText(R.string.display_dashboard_nowallpaper_summary);
}
}
-
}
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index 0b09124..126be11 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -25,6 +25,7 @@
import android.util.Log;
import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -34,16 +35,26 @@
import java.util.List;
public class WallpaperPreferenceController extends BasePreferenceController {
-
private static final String TAG = "WallpaperPrefController";
private final String mWallpaperPackage;
private final String mWallpaperClass;
+ private final String mStylesAndWallpaperClass;
public WallpaperPreferenceController(Context context, String key) {
super(context, key);
mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
+ mStylesAndWallpaperClass =
+ mContext.getString(R.string.config_styles_and_wallpaper_picker_class);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ Preference preference = screen.findPreference(getPreferenceKey());
+ preference.setTitle(mContext.getString(areStylesAvailable()
+ ? R.string.style_and_wallpaper_settings_title : R.string.wallpaper_settings_title));
}
@Override
@@ -52,14 +63,7 @@
Log.e(TAG, "No Wallpaper picker specified!");
return UNSUPPORTED_ON_DEVICE;
}
- final ComponentName componentName =
- new ComponentName(mWallpaperPackage, mWallpaperClass);
- final PackageManager pm = mContext.getPackageManager();
- final Intent intent = new Intent();
- intent.setComponent(componentName);
- final List<ResolveInfo> resolveInfos =
- pm.queryIntentActivities(intent, 0 /* flags */);
- return resolveInfos != null && !resolveInfos.isEmpty()
+ return canResolveWallpaperComponent(mWallpaperClass)
? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE;
}
@@ -68,6 +72,31 @@
disablePreferenceIfManaged((RestrictedPreference) preference);
}
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (getPreferenceKey().equals(preference.getKey())) {
+ final ComponentName componentName = new ComponentName(mWallpaperPackage,
+ areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass);
+ preference.getContext().startActivity(new Intent().setComponent(componentName));
+ return true;
+ }
+ return super.handlePreferenceTreeClick(preference);
+ }
+
+ /** Returns whether Styles & Wallpaper is enabled and available. */
+ public boolean areStylesAvailable() {
+ return !TextUtils.isEmpty(mStylesAndWallpaperClass)
+ && canResolveWallpaperComponent(mStylesAndWallpaperClass);
+ }
+
+ private boolean canResolveWallpaperComponent(String className) {
+ final ComponentName componentName = new ComponentName(mWallpaperPackage, className);
+ final PackageManager pm = mContext.getPackageManager();
+ final Intent intent = new Intent().setComponent(componentName);
+ final List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0 /* flags */);
+ return resolveInfos != null && !resolveInfos.isEmpty();
+ }
+
private void disablePreferenceIfManaged(RestrictedPreference pref) {
final String restriction = DISALLOW_SET_WALLPAPER;
if (pref != null) {
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
index 32f505e..74ff613 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -20,6 +20,7 @@
import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI;
import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.database.ContentObserver;
import android.database.Cursor;
@@ -32,7 +33,9 @@
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.util.ArrayList;
@@ -162,10 +165,16 @@
return visibleCards;
} finally {
if (!CardContentProvider.DELETE_CARD_URI.equals(mNotifyUri)) {
- final ContextualCardFeatureProvider contextualCardFeatureProvider =
- FeatureFactory.getFactory(mContext)
- .getContextualCardFeatureProvider(mContext);
- contextualCardFeatureProvider.logContextualCardDisplay(visibleCards, hiddenCards);
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW,
+ ContextualCardLogUtils.buildCardListLog(visibleCards));
+
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,
+ ContextualCardLogUtils.buildCardListLog(hiddenCards));
}
}
}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
index 18019a6..91b2e97 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
@@ -39,9 +39,9 @@
*/
public class ConditionContextualCardRenderer implements ContextualCardRenderer {
@LayoutRes
- public static final int VIEW_TYPE_HALF_WIDTH = R.layout.homepage_condition_half_tile;
+ public static final int VIEW_TYPE_HALF_WIDTH = R.layout.conditional_card_half_tile;
@LayoutRes
- public static final int VIEW_TYPE_FULL_WIDTH = R.layout.homepage_condition_full_tile;
+ public static final int VIEW_TYPE_FULL_WIDTH = R.layout.conditional_card_full_tile;
private final Context mContext;
private final ControllerRendererPool mControllerRendererPool;
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
index a516e13b..2944cc8 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
@@ -31,7 +31,7 @@
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class ConditionFooterContextualCardRenderer implements ContextualCardRenderer {
- public static final int VIEW_TYPE = R.layout.homepage_condition_footer;
+ public static final int VIEW_TYPE = R.layout.conditional_card_footer;
private static final String TAG = "ConditionFooterRenderer";
private final Context mContext;
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
index 2aa8aca..c5e987a 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
@@ -34,7 +34,7 @@
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class ConditionHeaderContextualCardRenderer implements ContextualCardRenderer {
- public static final int VIEW_TYPE = R.layout.homepage_condition_header;
+ public static final int VIEW_TYPE = R.layout.conditional_card_header;
private static final String TAG = "ConditionHeaderRenderer";
private final Context mContext;
@@ -61,7 +61,7 @@
view.icons.removeAllViews();
headerCard.getConditionalCards().stream().forEach(card -> {
final ImageView icon = (ImageView) LayoutInflater.from(mContext).inflate(
- R.layout.homepage_condition_header_icon, view.icons, false);
+ R.layout.conditional_card_header_icon, view.icons, false);
icon.setImageDrawable(card.getIconDrawable());
view.icons.addView(icon);
});
diff --git a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
index 20449f0..3bccabc 100644
--- a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
@@ -32,7 +32,7 @@
public class LegacySuggestionContextualCardRenderer implements ContextualCardRenderer {
@LayoutRes
- public static final int VIEW_TYPE = R.layout.homepage_suggestion_tile;
+ public static final int VIEW_TYPE = R.layout.legacy_suggestion_tile;
private final Context mContext;
private final ControllerRendererPool mControllerRendererPool;
diff --git a/src/com/android/settings/homepage/contextualcards/logging/ContextualCardLogUtils.java b/src/com/android/settings/homepage/contextualcards/logging/ContextualCardLogUtils.java
new file mode 100644
index 0000000..585eca3
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/logging/ContextualCardLogUtils.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2019 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.homepage.contextualcards.logging;
+
+import android.util.Log;
+
+import androidx.slice.widget.EventInfo;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utils of building contextual card to string, and parse string back to {@link CardLog}
+ */
+public class ContextualCardLogUtils {
+
+ private static final String TAG = "ContextualCardLogUtils";
+
+ private static final class TapTarget {
+ static int TARGET_DEFAULT = 0;
+ static int TARGET_TITLE = 1;
+ static int TARGET_TOGGLE = 2;
+ static int TARGET_SLIDER = 3;
+ }
+
+ /**
+ * Log data for a general contextual card event
+ */
+ public static class CardLog {
+ private final String mSliceUri;
+ private final double mRankingScore;
+
+ public CardLog(Builder builder) {
+ mSliceUri = builder.mSliceUri;
+ mRankingScore = builder.mRankingScore;
+ }
+
+ public String getSliceUri() {
+ return mSliceUri;
+ }
+
+ public double getRankingScore() {
+ return mRankingScore;
+ }
+
+ public static class Builder {
+ private String mSliceUri;
+ private double mRankingScore;
+
+ public Builder setSliceUri(String sliceUri) {
+ mSliceUri = sliceUri;
+ return this;
+ }
+
+ public Builder setRankingScore(double rankingScore) {
+ mRankingScore = rankingScore;
+ return this;
+ }
+ public CardLog build() {
+ return new CardLog(this);
+ }
+ }
+ }
+
+ /**
+ * Log data for a contextual card click event
+ */
+ public static class CardClickLog extends CardLog {
+ private final int mSliceRow;
+ private final int mSliceTapTarget;
+ private final int mUiPosition;
+
+ public CardClickLog(Builder builder) {
+ super(builder);
+ mSliceRow = builder.mSliceRow;
+ mSliceTapTarget = builder.mSliceTapTarget;
+ mUiPosition = builder.mUiPosition;
+ }
+
+ public int getSliceRow() {
+ return mSliceRow;
+ }
+
+ public int getSliceTapTarget() {
+ return mSliceTapTarget;
+ }
+
+ public int getUiPosition() {
+ return mUiPosition;
+ }
+
+ public static class Builder extends CardLog.Builder {
+ private int mSliceRow;
+ private int mSliceTapTarget;
+ private int mUiPosition;
+
+ public Builder setSliceRow(int sliceRow) {
+ mSliceRow = sliceRow;
+ return this;
+ }
+
+ public Builder setSliceTapTarget(int sliceTapTarget) {
+ mSliceTapTarget = sliceTapTarget;
+ return this;
+ }
+
+ public Builder setUiPosition(int uiPosition) {
+ mUiPosition = uiPosition;
+ return this;
+ }
+ @Override
+ public CardClickLog build() {
+ return new CardClickLog(this);
+ }
+ }
+ }
+
+ /**
+ * Serialize {@link ContextualCard} click event to string
+ *
+ * @param card Clicked Contextual card.
+ * @param sliceRow A Slice can contains multiple row, which row are we clicked
+ * @param tapTarget Integer value of {@link TapTarget}
+ * @param uiPosition Contextual card position in Listview
+ */
+ public static String buildCardClickLog(ContextualCard card, int sliceRow, int tapTarget,
+ int uiPosition) {
+ final StringBuilder log = new StringBuilder();
+ log.append(card.getTextSliceUri()).append("|")
+ .append(card.getRankingScore()).append("|")
+ .append(sliceRow).append("|")
+ .append(actionTypeToTapTarget(tapTarget)).append("|")
+ .append(uiPosition);
+ return log.toString();
+ }
+
+ /**
+ * Parse string to a {@link CardClickLog}
+ */
+ public static CardClickLog parseCardClickLog(String clickLog) {
+ if (clickLog != null) {
+ final String[] parts = clickLog.split("\\|");
+ if (parts.length < 5) {
+ return null;
+ }
+ try {
+ final CardClickLog.Builder builder = new CardClickLog.Builder();
+ builder.setSliceRow(Integer.parseInt(parts[2]))
+ .setSliceTapTarget(Integer.parseInt(parts[3]))
+ .setUiPosition(Integer.parseInt(parts[4]))
+ .setSliceUri(parts[0])
+ .setRankingScore(Double.parseDouble(parts[1]));
+ return builder.build();
+ } catch (Exception e) {
+ Log.e(TAG, "error parsing log", e);
+ return null;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Serialize {@link ContextualCard} to string
+ *
+ * @param card Contextual card.
+ */
+ public static String buildCardDismissLog(ContextualCard card) {
+ final StringBuilder log = new StringBuilder();
+ log.append(card.getTextSliceUri())
+ .append("|")
+ .append(card.getRankingScore());
+ return log.toString();
+ }
+
+ /**
+ * Parse string to a {@link CardLog}
+ */
+ public static CardLog parseCardDismissLog(String dismissLog) {
+ if (dismissLog != null) {
+ final String[] parts = dismissLog.split("\\|");
+ if (parts.length < 2) {
+ return null;
+ }
+ try {
+ final CardLog.Builder builder = new CardLog.Builder();
+ builder.setSliceUri(parts[0])
+ .setRankingScore(Double.parseDouble(parts[1]));
+ return builder.build();
+ } catch (Exception e) {
+ Log.e(TAG, "error parsing log", e);
+ return null;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Serialize List of {@link ContextualCard} to string
+ */
+ public static String buildCardListLog(List<ContextualCard> cards) {
+ final StringBuilder log = new StringBuilder();
+ log.append(cards.size());
+ for (ContextualCard card : cards) {
+ log.append("|").append(card.getTextSliceUri())
+ .append("|").append(card.getRankingScore());
+ }
+ return log.toString();
+ }
+
+ /**
+ * Parse string to a List of {@link CardLog}
+ */
+ public static List<CardLog> parseCardListLog(String listLog) {
+ final List<CardLog> logList = new ArrayList<>();
+ try {
+ final String[] parts = listLog.split("\\|");
+ if (Integer.parseInt(parts[0]) < 0) {
+ return logList;
+ }
+ final int size = parts.length;
+ for (int i = 1; i < size; ) {
+ final CardLog.Builder builder = new CardLog.Builder();
+ builder.setSliceUri(parts[i++])
+ .setRankingScore(Double.parseDouble(parts[i++]));
+ logList.add(builder.build());
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "error parsing log", e);
+ return logList;
+ }
+ return logList;
+ }
+
+ public static int actionTypeToTapTarget(int actionType) {
+ switch (actionType) {
+ case EventInfo.ACTION_TYPE_CONTENT:
+ return TapTarget.TARGET_TITLE;
+ case EventInfo.ACTION_TYPE_TOGGLE:
+ return TapTarget.TARGET_TOGGLE;
+ case EventInfo.ACTION_TYPE_SLIDER:
+ return TapTarget.TARGET_SLIDER;
+ default:
+ Log.w(TAG, "unknown type " + actionType);
+ return TapTarget.TARGET_DEFAULT;
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
index 07e23de..0551377 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
@@ -16,6 +16,7 @@
package com.android.settings.homepage.contextualcards.slices;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
@@ -27,10 +28,11 @@
import com.android.settings.homepage.contextualcards.CardDatabaseHelper;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardController;
-import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
import com.android.settings.homepage.contextualcards.ContextualCardFeedbackDialog;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.ThreadUtils;
/**
@@ -70,9 +72,13 @@
dbHelper.markContextualCardAsDismissed(mContext, card.getName());
});
showFeedbackDialog(card);
- final ContextualCardFeatureProvider contextualCardFeatureProvider =
- FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(mContext);
- contextualCardFeatureProvider.logContextualCardDismiss(card);
+
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_DISMISS,
+ ContextualCardLogUtils.buildCardDismissLog(card));
}
@Override
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index c5ed5db..725f087 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -49,9 +49,9 @@
* Card renderer for {@link ContextualCard} built as slice full card or slice half card.
*/
public class SliceContextualCardRenderer implements ContextualCardRenderer, LifecycleObserver {
- public static final int VIEW_TYPE_FULL_WIDTH = R.layout.homepage_slice_tile;
- public static final int VIEW_TYPE_HALF_WIDTH = R.layout.homepage_slice_half_tile;
- public static final int VIEW_TYPE_DEFERRED_SETUP = R.layout.homepage_slice_deferred_setup_tile;
+ public static final int VIEW_TYPE_FULL_WIDTH = R.layout.contextual_slice_full_tile;
+ public static final int VIEW_TYPE_HALF_WIDTH = R.layout.contextual_slice_half_tile;
+ public static final int VIEW_TYPE_DEFERRED_SETUP = R.layout.contextual_slice_deferred_setup;
private static final String TAG = "SliceCardRenderer";
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceDeferredSetupCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceDeferredSetupCardRendererHelper.java
index 630839c..ea9e424 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceDeferredSetupCardRendererHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceDeferredSetupCardRendererHelper.java
@@ -17,6 +17,7 @@
package com.android.settings.homepage.contextualcards.slices;
import android.app.PendingIntent;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.Log;
import android.view.View;
@@ -33,8 +34,9 @@
import com.android.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
-import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Card renderer helper for {@link ContextualCard} built as slice deferred setup card.
@@ -65,10 +67,14 @@
} catch (PendingIntent.CanceledException e) {
Log.w(TAG, "Failed to start intent " + primaryAction.getTitle());
}
- final ContextualCardFeatureProvider contextualCardFeatureProvider =
- FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(mContext);
- contextualCardFeatureProvider.logContextualCardClick(card, 0 /* row */,
+ final String log = ContextualCardLogUtils.buildCardClickLog(card, 0 /* row */,
EventInfo.ACTION_TYPE_CONTENT, view.getAdapterPosition());
+
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log);
});
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
index bb58e6d..a9a8346 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
@@ -16,6 +16,7 @@
package com.android.settings.homepage.contextualcards.slices;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.view.View;
import android.widget.LinearLayout;
@@ -26,8 +27,9 @@
import com.android.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
-import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Card renderer helper for {@link ContextualCard} built as slice full card.
@@ -54,11 +56,14 @@
// Set this listener so we can log the interaction users make on the slice
cardHolder.sliceView.setOnSliceActionListener(
(eventInfo, sliceItem) -> {
- final ContextualCardFeatureProvider contextualCardFeatureProvider =
- FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(
- mContext);
- contextualCardFeatureProvider.logContextualCardClick(card, eventInfo.rowIndex,
+ final String log = ContextualCardLogUtils.buildCardClickLog(card, eventInfo.rowIndex,
eventInfo.actionType, cardHolder.getAdapterPosition());
+
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log);
});
// Customize slice view for Settings
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java
index 6bb2208..f774542 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceHalfCardRendererHelper.java
@@ -17,6 +17,7 @@
package com.android.settings.homepage.contextualcards.slices;
import android.app.PendingIntent;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.Log;
import android.view.View;
@@ -32,8 +33,9 @@
import com.android.settings.R;
import com.android.settings.homepage.contextualcards.ContextualCard;
-import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* Card renderer helper for {@link ContextualCard} built as slice half card.
@@ -63,10 +65,14 @@
} catch (PendingIntent.CanceledException e) {
Log.w(TAG, "Failed to start intent " + primaryAction.getTitle());
}
- final ContextualCardFeatureProvider contextualCardFeatureProvider =
- FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(mContext);
- contextualCardFeatureProvider.logContextualCardClick(card, 0 /* row */,
+ final String log = ContextualCardLogUtils.buildCardClickLog(card, 0 /* row */,
EventInfo.ACTION_TYPE_CONTENT, view.getAdapterPosition());
+
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+
+ metricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log);
});
}
diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java
index e604261..70246cb 100644
--- a/src/com/android/settings/location/LocationServicePreferenceController.java
+++ b/src/com/android/settings/location/LocationServicePreferenceController.java
@@ -34,6 +34,7 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.List;
+import java.util.Map;
public class LocationServicePreferenceController extends LocationBasePreferenceController
implements LifecycleObserver, OnResume, OnPause {
@@ -41,14 +42,17 @@
private static final String TAG = "LocationServicePrefCtrl";
/** Key for preference category "Location services" */
private static final String KEY_LOCATION_SERVICES = "location_services";
+ /** Key for preference category "Location services for work" */
+ private static final String KEY_LOCATION_SERVICES_MANAGED = "location_services_managed_profile";
@VisibleForTesting
static final IntentFilter INTENT_FILTER_INJECTED_SETTING_CHANGED =
new IntentFilter(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED);
private PreferenceCategory mCategoryLocationServices;
+ private PreferenceCategory mCategoryLocationServicesManaged;
private final LocationSettings mFragment;
private final AppSettingsInjector mInjector;
- /** Receives UPDATE_INTENT */
+ /** Receives UPDATE_INTENT */
@VisibleForTesting
BroadcastReceiver mInjectedSettingsReceiver;
@@ -74,29 +78,36 @@
}
@Override
- public boolean isAvailable() {
- // If managed profile has lock-down on location access then its injected location services
- // must not be shown.
- return mInjector.hasInjectedSettings(mLocationEnabler.isManagedProfileRestrictedByBase()
- ? UserHandle.myUserId() : UserHandle.USER_CURRENT);
- }
-
- @Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mCategoryLocationServices = screen.findPreference(KEY_LOCATION_SERVICES);
+ mCategoryLocationServicesManaged = screen.findPreference(KEY_LOCATION_SERVICES_MANAGED);
}
@Override
public void updateState(Preference preference) {
mCategoryLocationServices.removeAll();
- final List<Preference> prefs = getLocationServices();
- for (Preference pref : prefs) {
- if (pref instanceof RestrictedAppPreference) {
- ((RestrictedAppPreference) pref).checkRestrictionAndSetDisabled();
+ mCategoryLocationServicesManaged.removeAll();
+ final Map<Integer, List<Preference>> prefs = getLocationServices();
+ boolean showPrimary = false;
+ boolean showManaged = false;
+ for (Map.Entry<Integer, List<Preference>> entry : prefs.entrySet()) {
+ for (Preference pref : entry.getValue()) {
+ if (pref instanceof RestrictedAppPreference) {
+ ((RestrictedAppPreference) pref).checkRestrictionAndSetDisabled();
+ }
+ }
+ if (entry.getKey() == UserHandle.myUserId()) {
+ LocationSettings.addPreferencesSorted(entry.getValue(), mCategoryLocationServices);
+ showPrimary = true;
+ } else {
+ LocationSettings.addPreferencesSorted(entry.getValue(),
+ mCategoryLocationServicesManaged);
+ showManaged = true;
}
}
- LocationSettings.addPreferencesSorted(prefs, mCategoryLocationServices);
+ mCategoryLocationServices.setVisible(showPrimary);
+ mCategoryLocationServicesManaged.setVisible(showManaged);
}
@Override
@@ -128,7 +139,7 @@
mContext.unregisterReceiver(mInjectedSettingsReceiver);
}
- private List<Preference> getLocationServices() {
+ private Map<Integer, List<Preference>> getLocationServices() {
// If location access is locked down by device policy then we only show injected settings
// for the primary profile.
final int profileUserId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java
index 5a5d6a2..28cb11e 100644
--- a/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -46,6 +46,7 @@
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
+import java.util.List;
/**
* Custom {@link Slice} for Mobile Data.
@@ -71,6 +72,11 @@
@Override
public Slice getSlice() {
+ // Mobile data not available, thus return no Slice.
+ if (!isMobileDataAvailable()) {
+ return null;
+ }
+
final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_network_cell);
final String title = mContext.getText(R.string.mobile_data_settings_title).toString();
@@ -178,6 +184,16 @@
intent, 0 /* flags */);
}
+ /**
+ * @return {@code true} when mobile data is not supported by the current device.
+ */
+ private boolean isMobileDataAvailable() {
+ final List<SubscriptionInfo> subInfoList =
+ mSubscriptionManager.getSelectableSubscriptionInfoList();
+
+ return !(subInfoList == null || subInfoList.isEmpty());
+ }
+
@VisibleForTesting
boolean isAirplaneModeEnabled() {
// Generic key since we only want the method check - no UI.
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 9659548..3578792 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -36,6 +36,7 @@
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.datausage.BillingCyclePreferenceController;
import com.android.settings.datausage.DataUsageSummaryPreferenceController;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController;
@@ -134,6 +135,7 @@
use(SmsDefaultSubscriptionController.class).init(getLifecycle());
use(MobileNetworkSwitchController.class).init(getLifecycle(), mSubId);
use(CarrierSettingsVersionPreferenceController.class).init(mSubId);
+ use(BillingCyclePreferenceController.class).init(mSubId);
}
use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
diff --git a/src/com/android/settings/nfc/SecureNfcEnabler.java b/src/com/android/settings/nfc/SecureNfcEnabler.java
index 065dc8b..9acaf64 100644
--- a/src/com/android/settings/nfc/SecureNfcEnabler.java
+++ b/src/com/android/settings/nfc/SecureNfcEnabler.java
@@ -46,7 +46,8 @@
mPreference.setEnabled(false);
break;
case NfcAdapter.STATE_ON:
- mPreference.setChecked(mPreference.isEnabled());
+ mPreference.setSummary(R.string.nfc_secure_toggle_summary);
+ mPreference.setChecked(mPreference.isChecked());
mPreference.setEnabled(true);
break;
case NfcAdapter.STATE_TURNING_ON:
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 24d85e2..e056d67 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -50,7 +50,7 @@
private static String KEY_ADVANCED_CATEGORY = "app_advanced";
private static String KEY_BADGE = "badge";
private static String KEY_APP_LINK = "app_link";
- private static String KEY_BUBBLE = "bubble";
+ private static String KEY_BUBBLE = "bubble_link_pref";
private static String[] LEGACY_NON_ADVANCED_KEYS = {KEY_BADGE, KEY_APP_LINK, KEY_BUBBLE};
private List<NotificationChannelGroup> mChannelGroupList;
diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java
index 0955571..94a268b 100644
--- a/src/com/android/settings/notification/ImportancePreferenceController.java
+++ b/src/com/android/settings/notification/ImportancePreferenceController.java
@@ -50,12 +50,18 @@
if (mAppRow == null) {
return false;
}
+ if (mAppRow.banned) {
+ return false;
+ }
if (mChannel == null) {
return false;
}
if (isDefaultChannel()) {
return false;
}
+ if (mChannelGroup != null && mChannelGroup.isBlocked()) {
+ return false;
+ }
return true;
}
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java
index d2b7c43..99f7e20 100644
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -73,12 +73,12 @@
if (mAppRow.banned) {
return false;
}
- if (mChannel != null) {
- return mChannel.getImportance() != IMPORTANCE_NONE;
- }
if (mChannelGroup != null) {
return !mChannelGroup.isBlocked();
}
+ if (mChannel != null) {
+ return mChannel.getImportance() != IMPORTANCE_NONE;
+ }
return true;
}
diff --git a/src/com/android/settings/panel/WifiPanel.java b/src/com/android/settings/panel/WifiPanel.java
index 6d83742..f9be081c 100644
--- a/src/com/android/settings/panel/WifiPanel.java
+++ b/src/com/android/settings/panel/WifiPanel.java
@@ -23,9 +23,9 @@
import com.android.settings.R;
import com.android.settings.SubSettings;
-import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settings.wifi.WifiSettings;
import java.util.ArrayList;
import java.util.List;
@@ -60,12 +60,12 @@
@Override
public Intent getSeeMoreIntent() {
final String screenTitle =
- mContext.getText(R.string.network_dashboard_title).toString();
+ mContext.getText(R.string.wifi_settings).toString();
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
- NetworkDashboardFragment.class.getName(),
+ WifiSettings.class.getName(),
null /* key */,
screenTitle,
- SettingsEnums.SETTINGS_NETWORK_CATEGORY);
+ SettingsEnums.WIFI);
intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
return intent;
}
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index baefa09..7f09071 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -16,19 +16,21 @@
package com.android.settings.password;
+import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
+import android.hardware.biometrics.IBiometricConfirmDeviceCredentialCallback;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
import android.os.Looper;
+import android.util.Log;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
@@ -40,6 +42,8 @@
*/
public class BiometricFragment extends InstrumentedFragment {
+ private static final String TAG = "ConfirmDeviceCredential/BiometricFragment";
+
// Re-set by the application. Should be done upon orientation changes, etc
private Executor mClientExecutor;
private AuthenticationCallback mClientCallback;
@@ -48,7 +52,6 @@
private int mUserId;
// Created/Initialized once and retained
- private final Handler mHandler = new Handler(Looper.getMainLooper());
private Bundle mBundle;
private BiometricPrompt mBiometricPrompt;
private CancellationSignal mCancellationSignal;
@@ -82,6 +85,20 @@
}
};
+ // TODO(b/123378871): Remove when moved.
+ private final IBiometricConfirmDeviceCredentialCallback mCancelCallback
+ = new IBiometricConfirmDeviceCredentialCallback.Stub() {
+ @Override
+ public void cancel() {
+ final Activity activity = getActivity();
+ if (activity != null) {
+ activity.finish();
+ } else {
+ Log.e(TAG, "Activity null!");
+ }
+ }
+ };
+
/**
* @param bundle Bundle passed from {@link BiometricPrompt.Builder#buildIntent()}
* @return
@@ -123,6 +140,7 @@
mBiometricPrompt = new BiometricPrompt.Builder(getContext())
.setTitle(mBundle.getString(BiometricPrompt.KEY_TITLE))
.setUseDefaultTitle() // use default title if title is null/empty
+ .setFromConfirmDeviceCredential()
.setSubtitle(mBundle.getString(BiometricPrompt.KEY_SUBTITLE))
.setDescription(mBundle.getString(BiometricPrompt.KEY_DESCRIPTION))
.setConfirmationRequired(
@@ -135,7 +153,7 @@
// TODO: CC doesn't use crypto for now
mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
- mAuthenticationCallback, mUserId);
+ mAuthenticationCallback, mUserId, mCancelCallback);
}
@Override
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index d3d5c49..53841e8 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -106,13 +106,11 @@
private AuthenticationCallback mAuthenticationCallback = new AuthenticationCallback() {
public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
if (!mGoingToBackground) {
- if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED) {
+ if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED
+ || errorCode == BiometricPrompt.BIOMETRIC_ERROR_CANCELED) {
if (mIsFallback) {
mBiometricManager.onConfirmDeviceCredentialError(
- BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED,
- getString(
- com.android.internal.R.string
- .biometric_error_user_canceled));
+ errorCode, getStringForError(errorCode));
}
finish();
} else {
@@ -139,6 +137,17 @@
}
};
+ private String getStringForError(int errorCode) {
+ switch (errorCode) {
+ case BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED:
+ return getString(com.android.internal.R.string.biometric_error_user_canceled);
+ case BiometricConstants.BIOMETRIC_ERROR_CANCELED:
+ return getString(com.android.internal.R.string.biometric_error_canceled);
+ default:
+ return null;
+ }
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -178,7 +187,6 @@
intent.getBundleExtra(KeyguardManager.EXTRA_BIOMETRIC_PROMPT_BUNDLE);
if (bpBundle != null) {
mIsFallback = true;
- // TODO: CDC maybe should show description as well.
mTitle = bpBundle.getString(BiometricPrompt.KEY_TITLE);
mDetails = bpBundle.getString(BiometricPrompt.KEY_SUBTITLE);
} else {
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 82883ca..aa40d27 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -19,6 +19,7 @@
import android.app.KeyguardManager;
import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricManager;
+import android.hardware.biometrics.IBiometricConfirmDeviceCredentialCallback;
import android.os.Bundle;
import android.os.UserManager;
import android.util.Log;
@@ -51,6 +52,15 @@
private ConfirmCredentialTheme mConfirmCredentialTheme;
private BiometricManager mBiometricManager;
+ // TODO(b/123378871): Remove when moved.
+ private final IBiometricConfirmDeviceCredentialCallback mCancelCallback
+ = new IBiometricConfirmDeviceCredentialCallback.Stub() {
+ @Override
+ public void cancel() {
+ finish();
+ }
+ };
+
private boolean isInternalActivity() {
return (this instanceof ConfirmLockPassword.InternalActivity)
|| (this instanceof ConfirmLockPattern.InternalActivity);
@@ -81,6 +91,7 @@
super.onCreate(savedState);
mBiometricManager = getSystemService(BiometricManager.class);
+ mBiometricManager.registerCancellationCallback(mCancelCallback);
if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {
// Prevent the content parent from consuming the window insets because GlifLayout uses
diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java
index 2d88673..ca3e5cc 100644
--- a/src/com/android/settings/widget/VideoPreference.java
+++ b/src/com/android/settings/widget/VideoPreference.java
@@ -220,11 +220,15 @@
private void initMediaPlayer() {
if (mMediaPlayer == null) {
mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
- mMediaPlayer.seekTo(0);
- mMediaPlayer.setOnSeekCompleteListener(mp -> mVideoReady = true);
- mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true));
- if (mSurface != null) {
- mMediaPlayer.setSurface(mSurface);
+ // when the playback res is invalid or others, MediaPlayer create may fail
+ // and return null, so need add the null judgement.
+ if (mMediaPlayer != null) {
+ mMediaPlayer.seekTo(0);
+ mMediaPlayer.setOnSeekCompleteListener(mp -> mVideoReady = true);
+ mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true));
+ if (mSurface != null) {
+ mMediaPlayer.setSurface(mSurface);
+ }
}
}
}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 7b21d21..79b6383 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -401,6 +401,7 @@
.setButton1Icon(R.drawable.ic_settings_delete)
.setButton1OnClickListener(view -> forgetNetwork())
.setButton2Text(R.string.wifi_sign_in_button_text)
+ .setButton2Icon(R.drawable.ic_settings_sign_in)
.setButton2OnClickListener(view -> signIntoNetwork())
.setButton3Text(R.string.wifi_connect)
.setButton3Icon(R.drawable.ic_settings_wireless)
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
index 23d794c..d16a6d2 100644
--- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
@@ -39,14 +39,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
-import org.robolectric.annotation.Config;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
@RunWith(RobolectricTestRunner.class)
public class TopLevelDisplayPreferenceControllerTest {
private Context mContext;
@@ -89,6 +88,19 @@
}
@Test
+ public void getSummary_hasWallpaperWithStyles_shouldReturnWallpaperSummary() {
+ when(mContext.getString(R.string.config_styles_and_wallpaper_picker_class))
+ .thenReturn("any.nonempty.class");
+ final List<ResolveInfo> resolveInfos = new ArrayList<>();
+ resolveInfos.add(mock(ResolveInfo.class));
+ when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+ .thenReturn(resolveInfos);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.display_dashboard_summary_with_style));
+ }
+
+ @Test
public void getSummary_hasWallpaper_shouldReturnNoWallpaperSummary() {
final List<ResolveInfo> resolveInfos = new ArrayList<>();
when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index a641b19..ca9dfcc 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -18,74 +18,132 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import android.content.Context;
+import android.content.ComponentName;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+
import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import com.google.common.collect.Lists;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResources.class})
public class WallpaperPreferenceControllerTest {
-
- private static final String WALLPAPER_PACKAGE = "TestPkg";
- private static final String WALLPAPER_CLASS = "TestCls";
private static final String TEST_KEY = "test_key";
- @Mock
- private Context mContext;
- @Mock
- private PackageManager mPackageManager;
+ private Intent mWallpaperIntent;
+ private Intent mStylesAndWallpaperIntent;
+ private FragmentActivity mContext;
+ private ShadowPackageManager mShadowPackageManager;
private WallpaperPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mContext.getString(R.string.config_wallpaper_picker_package))
- .thenReturn(WALLPAPER_PACKAGE);
- when(mContext.getString(R.string.config_wallpaper_picker_class))
- .thenReturn(WALLPAPER_CLASS);
- when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
+ mContext = Robolectric.buildActivity(FragmentActivity.class).get();
+ SettingsShadowResources.overrideResource(
+ R.string.config_wallpaper_picker_package, "bogus.package.for.testing");
+ SettingsShadowResources.overrideResource(
+ R.string.config_styles_and_wallpaper_picker_class, "bogus.package.class");
+ mWallpaperIntent = new Intent().setComponent(new ComponentName(
+ mContext.getString(R.string.config_wallpaper_picker_package),
+ mContext.getString(R.string.config_wallpaper_picker_class)));
+ mStylesAndWallpaperIntent = new Intent().setComponent(new ComponentName(
+ mContext.getString(R.string.config_wallpaper_picker_package),
+ mContext.getString(R.string.config_styles_and_wallpaper_picker_class)));
+ mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
mController = new WallpaperPreferenceController(mContext, TEST_KEY);
}
@Test
public void isAvailable_wallpaperPickerEnabled_shouldReturnTrue() {
- final List<ResolveInfo> resolveInfos = new ArrayList<>();
- resolveInfos.add(mock(ResolveInfo.class));
- when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
- .thenReturn(resolveInfos);
+ mShadowPackageManager.setResolveInfosForIntent(
+ mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_wallpaperPickerDisabled_shouldReturnFalse() {
- when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
+ mShadowPackageManager.setResolveInfosForIntent(
+ mWallpaperIntent, Lists.newArrayList());
assertThat(mController.isAvailable()).isFalse();
+ }
- final List<ResolveInfo> resolveInfos = new ArrayList<>();
- when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
- .thenReturn(resolveInfos);
+ @Test
+ public void areStylesAvailable_noComponentSpecified() {
+ SettingsShadowResources.overrideResource(
+ R.string.config_styles_and_wallpaper_picker_class, "");
+ mShadowPackageManager.setResolveInfosForIntent(
+ mStylesAndWallpaperIntent, Lists.newArrayList());
- assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.areStylesAvailable()).isFalse();
+ }
+
+ @Test
+ public void areStylesAvailable_componentUnresolveable() {
+ mShadowPackageManager.setResolveInfosForIntent(
+ mStylesAndWallpaperIntent, Lists.newArrayList());
+
+ assertThat(mController.areStylesAvailable()).isFalse();
+ }
+
+ @Test
+ public void areStylesAvailable_componentResolved() {
+ mShadowPackageManager.setResolveInfosForIntent(
+ mStylesAndWallpaperIntent,
+ Lists.newArrayList(mock(ResolveInfo.class)));
+
+ assertThat(mController.areStylesAvailable()).isTrue();
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_wallpaperOnly() {
+ mShadowPackageManager.setResolveInfosForIntent(
+ mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+ mShadowPackageManager.setResolveInfosForIntent(
+ mStylesAndWallpaperIntent, Lists.newArrayList());
+ Preference preference = new Preference(mContext);
+ preference.setKey(TEST_KEY);
+
+ mController.handlePreferenceTreeClick(preference);
+
+ assertThat(Shadows.shadowOf(mContext)
+ .getNextStartedActivityForResult().intent.getComponent().getClassName())
+ .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_stylesAndWallpaper() {
+ mShadowPackageManager.setResolveInfosForIntent(
+ mWallpaperIntent, Lists.newArrayList());
+ mShadowPackageManager.setResolveInfosForIntent(
+ mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+ Preference preference = new Preference(mContext);
+ preference.setKey(TEST_KEY);
+
+ mController.handlePreferenceTreeClick(preference);
+
+ assertThat(Shadows.shadowOf(mContext)
+ .getNextStartedActivityForResult().intent.getComponent().getClassName())
+ .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
}
}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
index 40e6939..d3f6499 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -22,12 +22,15 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.net.Uri;
@@ -182,8 +185,10 @@
mContextualCardLoader.getDisplayableCards(new ArrayList<>());
- verify(mFakeFeatureFactory.mContextualCardFeatureProvider).logContextualCardDisplay(
- anyList(), anyList());
+ verify(mFakeFeatureFactory.metricsFeatureProvider).action(any(),
+ eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_SHOW), any(String.class));
+ verify(mFakeFeatureFactory.metricsFeatureProvider).action(any(),
+ eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW), any(String.class));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/logging/ContextualCardLogUtilsTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/logging/ContextualCardLogUtilsTest.java
new file mode 100644
index 0000000..5207315
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/logging/ContextualCardLogUtilsTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2018 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.homepage.contextualcards.logging;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class ContextualCardLogUtilsTest {
+
+ private static final String TEST_URI = "content://test/test2";
+ private static final double TEST_SCORE = 0.12345f;
+
+ private static final ContextualCard TEST_CARD =
+ new ContextualCard.Builder()
+ .setSliceUri(Uri.parse(TEST_URI))
+ .setRankingScore(TEST_SCORE)
+ .build();
+
+ @Test
+ public void parseCardDismissLog_notValid_returnNull() {
+ assertThat(ContextualCardLogUtils.parseCardDismissLog(TEST_URI + "|" + TEST_URI)).isNull();
+ }
+
+ @Test
+ public void parseCardDismissLog_isValid_returnCorrectData() {
+ final String log = ContextualCardLogUtils.buildCardDismissLog(TEST_CARD);
+
+ final ContextualCardLogUtils.CardLog cardLog = ContextualCardLogUtils.parseCardDismissLog(
+ log);
+
+ assertThat(cardLog.getSliceUri()).isEqualTo(TEST_URI);
+ assertThat(cardLog.getRankingScore()).isEqualTo(TEST_SCORE);
+ }
+
+ @Test
+ public void parseCardClickLog_isValid_returnCorrectData() {
+ final int row = 1;
+ final int target = 2;
+ final int position = 3;
+ final String log = ContextualCardLogUtils.buildCardClickLog(TEST_CARD, row, target,
+ position);
+
+ final ContextualCardLogUtils.CardClickLog cardClickLog =
+ ContextualCardLogUtils.parseCardClickLog(log);
+
+ assertThat(cardClickLog.getSliceUri()).isEqualTo(TEST_URI);
+ assertThat(cardClickLog.getRankingScore()).isEqualTo(TEST_SCORE);
+ assertThat(cardClickLog.getSliceRow()).isEqualTo(row);
+ assertThat(cardClickLog.getSliceTapTarget()).isEqualTo(
+ ContextualCardLogUtils.actionTypeToTapTarget(target));
+ assertThat(cardClickLog.getUiPosition()).isEqualTo(position);
+ }
+
+ @Test
+ public void parseCardClickList_isValid_returnCorrectData() {
+ final ContextualCard testcard =
+ new ContextualCard.Builder()
+ .setSliceUri(Uri.parse("testtest"))
+ .setRankingScore(-1d)
+ .build();
+ final List<ContextualCard> cardList = new ArrayList<>();
+ cardList.add(TEST_CARD);
+ cardList.add(testcard);
+ final String log = ContextualCardLogUtils.buildCardListLog(cardList);
+
+ final List<ContextualCardLogUtils.CardLog> cardClickLogList =
+ ContextualCardLogUtils.parseCardListLog(log);
+
+ assertThat(cardClickLogList.size()).isEqualTo(2);
+ assertThat(cardClickLogList.get(0).getSliceUri()).isEqualTo(TEST_URI);
+ assertThat(cardClickLogList.get(0).getRankingScore()).isEqualTo(TEST_SCORE);
+ assertThat(cardClickLogList.get(1).getSliceUri()).isEqualTo("testtest");
+ assertThat(cardClickLogList.get(1).getRankingScore()).isEqualTo(-1d);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java
index 94fbb97..51d2523 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java
@@ -18,13 +18,15 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
@@ -96,7 +98,8 @@
cr.close();
assertThat(qryDismissed).isEqualTo(1);
- verify(mFeatureFactory.mContextualCardFeatureProvider).logContextualCardDismiss(card);
+ verify(mFeatureFactory.metricsFeatureProvider).action(any(),
+ eq(SettingsEnums.ACTION_CONTEXTUAL_CARD_DISMISS), any(String.class));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
index 75d6f82..c6709ed 100644
--- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
@@ -31,6 +31,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.util.ArrayMap;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
@@ -53,15 +54,20 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowUserManager.class)
public class LocationServicePreferenceControllerTest {
+ private static final String LOCATION_SERVICES_MANAGED_PROFILE_KEY =
+ "location_services_managed_profile";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private LocationSettings mFragment;
@Mock
- private PreferenceCategory mCategory;
+ private PreferenceCategory mCategoryPrimary;
+ @Mock
+ private PreferenceCategory mCategoryManaged;
@Mock
private PreferenceScreen mScreen;
@Mock
@@ -83,27 +89,16 @@
mController = spy(new LocationServicePreferenceController(
mContext, mFragment, mLifecycle, mSettingsInjector));
final String key = mController.getPreferenceKey();
- when(mScreen.findPreference(key)).thenReturn(mCategory);
- when(mCategory.getKey()).thenReturn(key);
+ when(mScreen.findPreference(key)).thenReturn(mCategoryPrimary);
+ when(mScreen.findPreference(LOCATION_SERVICES_MANAGED_PROFILE_KEY)).thenReturn(
+ mCategoryManaged);
+ when(mCategoryPrimary.getKey()).thenReturn(key);
+ when(mCategoryManaged.getKey()).thenReturn(LOCATION_SERVICES_MANAGED_PROFILE_KEY);
when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
}
@Test
- public void isAvailable_noInjectedSettings_shouldReturnFalse() {
- doReturn(false).when(mSettingsInjector).hasInjectedSettings(anyInt());
-
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void isAvailable_hasInjectedSettings_shouldReturnFalse() {
- doReturn(true).when(mSettingsInjector).hasInjectedSettings(anyInt());
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
public void onResume_shouldRegisterListener() {
mController.onResume();
@@ -122,24 +117,26 @@
@Test
public void updateState_shouldRemoveAllAndAddInjectedSettings() {
final List<Preference> preferences = new ArrayList<>();
+ final Map<Integer, List<Preference>> map = new ArrayMap<>();
final Preference pref1 = new Preference(mContext);
pref1.setTitle("Title1");
final Preference pref2 = new Preference(mContext);
pref2.setTitle("Title2");
preferences.add(pref1);
preferences.add(pref2);
- doReturn(preferences)
- .when(mSettingsInjector).getInjectedSettings(any(Context.class), anyInt());
+ map.put(UserHandle.myUserId(), preferences);
+ doReturn(map)
+ .when(mSettingsInjector).getInjectedSettings(any(Context.class), anyInt());
when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
ShadowUserManager.getShadow().setProfileIdsWithDisabled(new int[]{UserHandle.myUserId()});
mController.displayPreference(mScreen);
- mController.updateState(mCategory);
+ mController.updateState(mCategoryPrimary);
- verify(mCategory).removeAll();
- verify(mCategory).addPreference(pref1);
- verify(mCategory).addPreference(pref2);
+ verify(mCategoryPrimary).removeAll();
+ verify(mCategoryPrimary).addPreference(pref1);
+ verify(mCategoryPrimary).addPreference(pref2);
}
@Test
@@ -161,7 +158,7 @@
when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(componentName);
mController.displayPreference(mScreen);
- mController.updateState(mCategory);
+ mController.updateState(mCategoryPrimary);
verify(mSettingsInjector).getInjectedSettings(
any(Context.class), eq(UserHandle.myUserId()));
}
@@ -181,7 +178,7 @@
enforcingUsers);
mController.displayPreference(mScreen);
- mController.updateState(mCategory);
+ mController.updateState(mCategoryPrimary);
verify(mSettingsInjector).getInjectedSettings(
any(Context.class), eq(UserHandle.USER_CURRENT));
}
@@ -200,7 +197,9 @@
UserManager.DISALLOW_CONFIG_LOCATION);
pref.setTitle("Location Accuracy");
preferences.add(pref);
- doReturn(preferences).when(mSettingsInjector)
+ final Map<Integer, List<Preference>> map = new ArrayMap<>();
+ map.put(UserHandle.myUserId(), preferences);
+ doReturn(map).when(mSettingsInjector)
.getInjectedSettings(any(Context.class), anyInt());
ShadowUserManager.getShadow().setProfileIdsWithDisabled(new int[]{UserHandle.myUserId()});
@@ -217,7 +216,7 @@
when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(componentName);
mController.displayPreference(mScreen);
- mController.updateState(mCategory);
+ mController.updateState(mCategoryPrimary);
assertThat(pref.isEnabled()).isFalse();
assertThat(pref.isDisabledByAdmin()).isTrue();
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
index e488d0c..e59fbaf 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataSliceTest.java
@@ -49,6 +49,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@@ -76,6 +78,9 @@
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(SUB_ID).when(mSubscriptionInfo).getSubscriptionId();
+ doReturn(new ArrayList<>(Arrays.asList(mSubscriptionInfo)))
+ .when(mSubscriptionManager).getSelectableSubscriptionInfoList();
+
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
@@ -165,6 +170,24 @@
}
@Test
+ public void isMobileDataAvailable_noSubscriptions_returnsNull() {
+ doReturn(new ArrayList<>()).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
+
+ final Slice slice = mMobileDataSlice.getSlice();
+
+ assertThat(slice).isNull();
+ }
+
+ @Test
+ public void isMobileDataAvailable_nullSubscriptions_returnsNull() {
+ doReturn(null).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
+
+ final Slice slice = mMobileDataSlice.getSlice();
+
+ assertThat(slice).isNull();
+ }
+
+ @Test
public void airplaneModeEnabled_slicePrimaryActionIsEmpty() {
doReturn(true).when(mMobileDataSlice).isAirplaneModeEnabled();
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
index c180ace..cee7a06 100644
--- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -36,6 +37,7 @@
import android.app.Notification;
import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
import android.app.NotificationManager;
import android.content.Context;
import android.os.UserManager;
@@ -100,7 +102,18 @@
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, mock(NotificationChannel.class), null, null);
- assertTrue(mController.isAvailable());
+ assertFalse(mController.isAvailable());
+ }
+
+ @Test
+ public void testIsAvailable_isGroupBlocked() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ NotificationChannel channel = mock(NotificationChannel.class);
+ when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
+ NotificationChannelGroup group = mock(NotificationChannelGroup.class);
+ when(group.isBlocked()).thenReturn(true);
+ mController.onResume(appRow, channel, group, null);
+ assertFalse(mController.isAvailable());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
index 9c53a7b..626d2e3 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
@@ -117,6 +117,7 @@
public void isAvailable_notIfChannelGroupBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
+ when(channel.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
NotificationChannelGroup group = mock(NotificationChannelGroup.class);
mController.onResume(appRow, channel, group, null);
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index b68a4ee..8ca577c 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -12,6 +12,7 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.RealObject;
+import org.robolectric.annotation.Resetter;
import org.robolectric.shadows.ShadowResources;
import org.robolectric.util.ReflectionHelpers.ClassParameter;
@@ -40,6 +41,7 @@
overrideResource(resId, value);
}
+ @Resetter
public static void reset() {
sResourceOverrides.clear();
}