Merge "Notification channel group res id labels."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c8ba07..871de12 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3077,7 +3077,8 @@
<activity android:name=".Settings$SupportDashboardActivity"
android:label="@string/page_tab_title_support"
- android:icon="@drawable/ic_help">
+ android:icon="@drawable/ic_help"
+ android:enabled="@bool/config_support_enabled">
<intent-filter android:priority="0">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 6b6a578..00d4cca 100644
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -88,6 +88,17 @@
android:paddingTop="8dp"/>
<TextView
+ android:id="@+id/install_type"
+ android:visibility="gone"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="start"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:textAppearance="@android:style/TextAppearance.Material.Body1"
+ android:textColor="?android:attr/textColorSecondary"/>
+
+ <TextView
android:id="@+id/app_detail_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -101,38 +112,4 @@
</RelativeLayout>
- <TextView
- android:id="@+id/instant_app_developer_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:visibility="gone"/>
-
- <LinearLayout
- android:id="@+id/instant_app_maturity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:visibility="gone">
-
- <ImageView
- android:id="@+id/instant_app_maturity_icon"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:scaleType="fitXY"/>
- <TextView
- android:id="@+id/instant_app_maturity_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- </LinearLayout>
-
- <TextView
- android:id="@+id/instant_app_monetization"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:visibility="gone"/>
-
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/encryption_interstitial_header.xml b/res/layout/encryption_interstitial_header.xml
index 9601fa8..b4f6dbb 100644
--- a/res/layout/encryption_interstitial_header.xml
+++ b/res/layout/encryption_interstitial_header.xml
@@ -15,7 +15,9 @@
limitations under the License.
-->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/encryption_interstitial_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
diff --git a/res/values/config.xml b/res/values/config.xml
index 1ebc4c7..0fa2b71 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -64,4 +64,7 @@
<!-- If the Storage Manager settings are enabled. -->
<bool name="config_storage_manager_settings_enabled">false</bool>
+ <!-- If the support features are enabled. -->
+ <bool name="config_support_enabled">false</bool>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 01547ef..4df5526 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8220,6 +8220,9 @@
<!-- On status for the automatic storage manager. [CHAR_LIMIT=10] -->
<string name="storage_manager_indicator_on">On</string>
+ <!-- Added as the value of a header field indicating this is an instant app (as opposed to installed normally) -->
+ <string name="install_type_instant">Instant app</string>
+
<!-- Title of games app storage screen [CHAR LIMIT=30] -->
<string name="game_storage_settings">Games</string>
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 1b18b18..4f24381 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -196,6 +196,9 @@
@Override
public boolean onPreferenceTreeClick(Preference preference) {
final String key = preference.getKey();
+ if (key == null) {
+ return super.onPreferenceTreeClick(preference);
+ }
if (key.equals(KEY_ENCRYPT_REQUIRE_PASSWORD)) {
final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
if (accEn && !mPasswordRequired) {
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 1b9b3b3..d0275ba 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -31,6 +31,10 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
import android.nfc.NfcAdapter;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -679,6 +683,13 @@
mDevelopmentPreferencesListener = null;
}
+ @Override
+ public void setTaskDescription(ActivityManager.TaskDescription taskDescription) {
+ final Bitmap icon = getBitmapFromXmlResource(R.drawable.ic_launcher_settings);
+ taskDescription.setIcon(icon);
+ super.setTaskDescription(taskDescription);
+ }
+
protected boolean isValidFragment(String fragmentName) {
// Almost all fragments are wrapped in this,
// except for a few that have their own activities.
@@ -1114,4 +1125,17 @@
}
super.onActivityResult(requestCode, resultCode, data);
}
+
+ @VisibleForTesting
+ Bitmap getBitmapFromXmlResource(int drawableRes) {
+ Drawable drawable = getResources().getDrawable(drawableRes, getTheme());
+ Canvas canvas = new Canvas();
+ Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
+ drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+ canvas.setBitmap(bitmap);
+ drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+ drawable.draw(canvas);
+
+ return bitmap;
+ }
}
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
index 1d64fca..45b8960 100644
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ b/src/com/android/settings/applications/AppHeaderController.java
@@ -37,7 +37,6 @@
import com.android.settings.AppHeader;
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.applications.instantapps.InstantAppDetails;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.ApplicationsState;
@@ -81,7 +80,7 @@
@ActionType
private int mRightAction;
- private InstantAppDetails mInstantAppDetails;
+ private boolean mIsInstantApp;
public AppHeaderController(Context context, Fragment fragment, View appHeader) {
mContext = context;
@@ -154,8 +153,8 @@
return this;
}
- public AppHeaderController setInstantAppDetails(InstantAppDetails instantAppDetails) {
- mInstantAppDetails = instantAppDetails;
+ public AppHeaderController setIsInstantApp(boolean isInstantApp) {
+ this.mIsInstantApp = isInstantApp;
return this;
}
@@ -220,26 +219,9 @@
bindAppHeaderButtons();
}
- if (mInstantAppDetails != null) {
- setText(R.id.instant_app_developer_title, mInstantAppDetails.developerTitle);
- View maturity = mAppHeader.findViewById(R.id.instant_app_maturity);
-
- if (maturity != null) {
- String maturityText = mInstantAppDetails.maturityRatingString;
- Drawable maturityIcon = mInstantAppDetails.maturityRatingIcon;
- if (!TextUtils.isEmpty(maturityText) || maturityIcon != null) {
- maturity.setVisibility(View.VISIBLE);
- }
- setText(R.id.instant_app_maturity_text, maturityText);
- if (maturityIcon != null) {
- ImageView maturityIconView = (ImageView) mAppHeader.findViewById(
- R.id.instant_app_maturity_icon);
- if (maturityIconView != null) {
- maturityIconView.setImageDrawable(maturityIcon);
- }
- }
- }
- setText(R.id.instant_app_monetization, mInstantAppDetails.monetizationNotice);
+ if (mIsInstantApp) {
+ setText(R.id.install_type,
+ mAppHeader.getResources().getString(R.string.install_type_instant));
}
return mAppHeader;
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
index 910b618..4f3e8fa 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -23,6 +23,7 @@
import com.android.settings.AppHeader;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.applications.AppUtils;
import static com.android.settings.applications.AppHeaderController.ActionType;
@@ -52,6 +53,7 @@
.setIcon(mPackageInfo.applicationInfo.loadIcon(mPm))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
.setSummary(mPackageInfo)
+ .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
.setPackageName(mPackageName)
.setUid(mPackageInfo.applicationInfo.uid)
.setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 0be4d9e..53f53c4 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -81,7 +81,6 @@
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
-import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
@@ -102,6 +101,8 @@
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.PermissionsSummaryHelper;
+import com.android.settingslib.applications.PermissionsSummaryHelper.PermissionsResultCallback;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader;
@@ -490,23 +491,7 @@
if (mFinishing) {
return;
}
- boolean showIt = true;
- if (mUpdatedSysApp) {
- showIt = false;
- } else if (mAppEntry == null) {
- showIt = false;
- } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
- showIt = false;
- } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
- showIt = false;
- } else if (UserHandle.myUserId() != 0) {
- showIt = false;
- } else if (mUserManager.getUsers().size() < 2) {
- showIt = false;
- } else if (PackageUtil.countPackageInUsers(mPm, mUserManager, mPackageName) < 2) {
- showIt = false;
- }
- menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(showIt);
+ menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(shouldShowUninstallForAll(mAppEntry));
mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);
uninstallUpdatesItem.setVisible(mUpdatedSysApp && !mAppsControlDisallowedBySystem);
@@ -563,6 +548,7 @@
.setLabel(mAppEntry)
.setIcon(mAppEntry)
.setSummary(getString(getInstallationStatus(mAppEntry.info)))
+ .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
.done(false /* rebindActions */);
mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName));
} else {
@@ -572,6 +558,28 @@
}
@VisibleForTesting
+ boolean shouldShowUninstallForAll(ApplicationsState.AppEntry appEntry) {
+ boolean showIt = true;
+ if (mUpdatedSysApp) {
+ showIt = false;
+ } else if (appEntry == null) {
+ showIt = false;
+ } else if ((appEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+ showIt = false;
+ } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+ showIt = false;
+ } else if (UserHandle.myUserId() != 0) {
+ showIt = false;
+ } else if (mUserManager.getUsers().size() < 2) {
+ showIt = false;
+ } else if (PackageUtil.countPackageInUsers(mPm, mUserManager, mPackageName) < 2
+ && (appEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) {
+ showIt = false;
+ }
+ return showIt;
+ }
+
+ @VisibleForTesting
int getInstallationStatus(ApplicationInfo info) {
if ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
return R.string.not_installed;
diff --git a/src/com/android/settings/applications/PermissionsSummaryHelper.java b/src/com/android/settings/applications/PermissionsSummaryHelper.java
deleted file mode 100644
index bac6b24..0000000
--- a/src/com/android/settings/applications/PermissionsSummaryHelper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2015 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.applications;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.content.pm.permission.RuntimePermissionPresentationInfo;
-import android.content.pm.permission.RuntimePermissionPresenter;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class PermissionsSummaryHelper {
-
- public static void getPermissionSummary(Context context, String pkg,
- final PermissionsResultCallback callback) {
- final RuntimePermissionPresenter presenter =
- RuntimePermissionPresenter.getInstance(context);
- presenter.getAppPermissions(pkg, new RuntimePermissionPresenter.OnResultCallback() {
- @Override
- public void onGetAppPermissions(
- @NonNull List<RuntimePermissionPresentationInfo> permissions) {
- final int permissionCount = permissions.size();
-
- int grantedStandardCount = 0;
- int grantedAdditionalCount = 0;
- int requestedCount = 0;
- List<CharSequence> grantedStandardLabels = new ArrayList<>();
-
- for (int i = 0; i < permissionCount; i++) {
- RuntimePermissionPresentationInfo permission = permissions.get(i);
- requestedCount++;
- if (permission.isGranted()) {
- if (permission.isStandard()) {
- grantedStandardLabels.add(permission.getLabel());
- grantedStandardCount++;
- } else {
- grantedAdditionalCount++;
- }
- }
- }
-
- Collator collator = Collator.getInstance();
- collator.setStrength(Collator.PRIMARY);
- Collections.sort(grantedStandardLabels, collator);
-
- callback.onPermissionSummaryResult(grantedStandardCount, requestedCount,
- grantedAdditionalCount, grantedStandardLabels);
- }
- }, null);
- }
-
- public static abstract class PermissionsResultCallback {
- public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount,
- int standardUsedPermissionAppCount) {
- /* do nothing - stub */
- }
-
- public void onPermissionSummaryResult(int standardGrantedPermissionCount,
- int requestedPermissionCount, int additionalGrantedPermissionCount,
- List<CharSequence> grantedGroupLabels) {
- /* do nothing - stub */
- }
- }
-}
diff --git a/src/com/android/settings/applications/instantapps/InstantAppDetails.java b/src/com/android/settings/applications/instantapps/InstantAppDetails.java
deleted file mode 100644
index 8b54c20..0000000
--- a/src/com/android/settings/applications/instantapps/InstantAppDetails.java
+++ /dev/null
@@ -1,110 +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.applications.instantapps;
-
-import android.graphics.drawable.Drawable;
-import java.net.URL;
-
-/**
- * Encapsulates state about instant apps that is provided by an app store implementation.
- */
-public class InstantAppDetails {
-
- // Most of these members are self-explanatory; the one that may not be is
- // monetizationNotice, which is a string alerting users that the app contains ads and/or uses
- // in-app purchases (this may eventually become two separate members).
- public final Drawable maturityRatingIcon;
- public final String maturityRatingString;
- public final String monetizationNotice;
- public final String developerTitle;
- public final URL privacyPolicy;
- public final URL developerWebsite;
- public final String developerEmail;
- public final String developerMailingAddress;
-
- public static class Builder {
- private Drawable mMaturityRatingIcon;
- private String mMaturityRatingString;
- private String mMonetizationNotice;
- private String mDeveloperTitle;
- private URL mPrivacyPolicy;
- private URL mDeveloperWebsite;
- private String mDeveloperEmail;
- private String mDeveloperMailingAddress;
-
- public Builder maturityRatingIcon(Drawable maturityRatingIcon) {
- this.mMaturityRatingIcon = maturityRatingIcon;
- return this;
- }
-
- public Builder maturityRatingString(String maturityRatingString) {
- mMaturityRatingString = maturityRatingString;
- return this;
- }
-
- public Builder monetizationNotice(String monetizationNotice) {
- mMonetizationNotice = monetizationNotice;
- return this;
- }
-
- public Builder developerTitle(String developerTitle) {
- mDeveloperTitle = developerTitle;
- return this;
- }
-
- public Builder privacyPolicy(URL privacyPolicy) {
- mPrivacyPolicy = privacyPolicy;
- return this;
- }
-
- public Builder developerWebsite(URL developerWebsite) {
- mDeveloperWebsite = developerWebsite;
- return this;
- }
-
- public Builder developerEmail(String developerEmail) {
- mDeveloperEmail = developerEmail;
- return this;
- }
-
- public Builder developerMailingAddress(String developerMailingAddress) {
- mDeveloperMailingAddress = developerMailingAddress;
- return this;
- }
-
- public InstantAppDetails build() {
- return new InstantAppDetails(mMaturityRatingIcon, mMaturityRatingString,
- mMonetizationNotice, mDeveloperTitle, mPrivacyPolicy, mDeveloperWebsite,
- mDeveloperEmail, mDeveloperMailingAddress);
- }
- }
-
- public static Builder builder() { return new Builder(); }
-
- private InstantAppDetails(Drawable maturityRatingIcon, String maturityRatingString,
- String monetizationNotice, String developerTitle, URL privacyPolicy,
- URL developerWebsite, String developerEmail, String developerMailingAddress) {
- this.maturityRatingIcon = maturityRatingIcon;
- this.maturityRatingString = maturityRatingString;
- this.monetizationNotice = monetizationNotice;
- this.developerTitle = developerTitle;
- this.privacyPolicy = privacyPolicy;
- this.developerWebsite = developerWebsite;
- this.developerEmail = developerEmail;
- this.developerMailingAddress = developerMailingAddress;
- }
-}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 50c3f06..55fcaf8 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -53,6 +53,7 @@
import com.android.settings.applications.LayoutPreference;
import com.android.settings.applications.ManageApplications;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.display.AutoBrightnessPreferenceController;
import com.android.settings.display.TimeoutPreferenceController;
@@ -90,7 +91,8 @@
private static final int MENU_STATS_TYPE = Menu.FIRST;
- private static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
+ @VisibleForTesting
+ static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
@VisibleForTesting
static final int MENU_ADDITIONAL_BATTERY_INFO = Menu.FIRST + 4;
@VisibleForTesting
@@ -216,6 +218,10 @@
@Override
public boolean onOptionsItemSelected(MenuItem item) {
final SettingsActivity sa = (SettingsActivity) getActivity();
+ final Context context = getContext();
+ final MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+
switch (item.getItemId()) {
case MENU_STATS_TYPE:
if (mStatsType == BatteryStats.STATS_SINCE_CHARGED) {
@@ -231,15 +237,21 @@
HighPowerApplicationsActivity.class.getName());
sa.startPreferencePanel(this, ManageApplications.class.getName(), args,
R.string.high_power_apps, null, null, 0);
+ metricsFeatureProvider.action(context,
+ MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
return true;
case MENU_ADDITIONAL_BATTERY_INFO:
startActivity(FeatureFactory.getFactory(getContext())
.getPowerUsageFeatureProvider(getContext())
.getAdditionalBatteryInfoIntent());
+ metricsFeatureProvider.action(context,
+ MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
return true;
case MENU_TOGGLE_APPS:
mShowAllApps = !mShowAllApps;
item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
+ metricsFeatureProvider.action(context,
+ MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, mShowAllApps);
refreshStats();
return true;
default:
diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java
index f457320..1d82720 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -22,6 +22,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getLifecycle());
+ }
+
+ private static List<PreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
- controllers.add(new AssistGesturePreferenceController(context, getLifecycle()));
+ controllers.add(new AssistGesturePreferenceController(context, lifecycle));
return controllers;
}
@@ -69,6 +75,11 @@
sir.xmlResId = R.xml.assist_gesture_settings;
return Arrays.asList(sir);
}
+
+ @Override
+ public List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
};
}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 9251f0b..b17341a 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -22,6 +22,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getLifecycle());
+ }
+
+ private static List<PreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
- controllers.add(new DoubleTapPowerPreferenceController(context, getLifecycle()));
+ controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle));
return controllers;
}
@@ -69,5 +75,10 @@
sir.xmlResId = R.xml.double_tap_power_settings;
return Arrays.asList(sir);
}
+
+ @Override
+ public List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
};
}
diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index f374f9e..a215dae 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -24,6 +24,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,8 +54,13 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getLifecycle());
+ }
+
+ private static List<PreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
- controllers.add(new DoubleTapScreenPreferenceController(context, getLifecycle(),
+ controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
new AmbientDisplayConfiguration(context), UserHandle.myUserId()));
return controllers;
}
@@ -72,5 +78,10 @@
sir.xmlResId = R.xml.double_tap_screen_settings;
return Arrays.asList(sir);
}
+
+ @Override
+ public List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
};
}
diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
index 5f5b873..bee9474 100644
--- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
+++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
@@ -22,6 +22,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getLifecycle());
+ }
+
+ private static List<PreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
- controllers.add(new DoubleTwistPreferenceController(context, getLifecycle()));
+ controllers.add(new DoubleTwistPreferenceController(context, lifecycle));
return controllers;
}
@@ -69,5 +75,11 @@
sir.xmlResId = R.xml.double_twist_gesture_settings;
return Arrays.asList(sir);
}
+
+ @Override
+ public List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
};
+
}
diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java
index 08e61fa..e4d12f2 100644
--- a/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -24,6 +24,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,8 +54,13 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getLifecycle());
+ }
+
+ private static List<PreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
- controllers.add(new PickupGesturePreferenceController(context, getLifecycle(),
+ controllers.add(new PickupGesturePreferenceController(context, lifecycle,
new AmbientDisplayConfiguration(context), UserHandle.myUserId()));
return controllers;
}
@@ -72,6 +78,11 @@
sir.xmlResId = R.xml.pick_up_gesture_settings;
return Arrays.asList(sir);
}
+
+ @Override
+ public List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
};
}
diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
index 155412c..d948e55 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
@@ -22,6 +22,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getLifecycle());
+ }
+
+ private static List<PreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
- controllers.add(new SwipeToNotificationPreferenceController(context, getLifecycle()));
+ controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle));
return controllers;
}
@@ -69,5 +75,10 @@
sir.xmlResId = R.xml.swipe_to_notification_settings;
return Arrays.asList(sir);
}
+
+ @Override
+ public List<PreferenceController> getPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
};
}
diff --git a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
new file mode 100644
index 0000000..6487818
--- /dev/null
+++ b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class EncryptionInterstitialTest {
+
+ private Instrumentation mInstrumentation;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ mContext = mInstrumentation.getTargetContext();
+ }
+
+ @Test
+ public void clickHeader_shouldNotCrash() {
+ mInstrumentation.startActivitySync(
+ new Intent().setClassName(mContext, EncryptionInterstitial.class.getName()));
+ onView(withId(R.id.encryption_interstitial_header));
+ // Nothing should happen
+ }
+}
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
index cb04679..8184d2c 100644
--- a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
+++ b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
@@ -1,11 +1,5 @@
-com.android.settings.gestures.PickupGestureSettings
com.android.settings.language.LanguageAndInputSettings
com.android.settings.enterprise.EnterprisePrivacySettings
-com.android.settings.gestures.DoubleTapScreenSettings
com.android.settings.applications.AdvancedAppSettings
-com.android.settings.gestures.AssistGestureSettings
com.android.settings.fuelgauge.PowerUsageSummary
-com.android.settings.gestures.SwipeToNotificationSettings
com.android.settings.inputmethod.InputMethodAndLanguageSettings
-com.android.settings.gestures.DoubleTapPowerSettings
-com.android.settings.gestures.DoubleTwistGestureSettings
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index df7a454..6a5b935 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -16,12 +16,13 @@
package com.android.settings;
+import android.app.ActivityManager;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Context;
import android.content.Intent;
+import android.graphics.Bitmap;
import com.android.settings.testutils.FakeFeatureFactory;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,9 +33,12 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -45,7 +49,10 @@
private Context mContext;
@Mock
private FragmentManager mFragmentManager;
-
+ @Mock
+ private ActivityManager.TaskDescription mTaskDescription;
+ @Mock
+ private Bitmap mBitmap;
private SettingsActivity mActivity;
@Before
@@ -53,14 +60,16 @@
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
final FakeFeatureFactory factory =
- (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+ (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
when(factory.dashboardFeatureProvider.isEnabled()).thenReturn(true);
+
+ mActivity = spy(new SettingsActivity());
+ doReturn(mBitmap).when(mActivity).getBitmapFromXmlResource(anyInt());
}
@Test
public void testQueryTextChange_shouldUpdate() {
final String testQuery = "abc";
- mActivity = new SettingsActivity();
assertThat(mActivity.mSearchQuery).isNull();
try {
@@ -83,4 +92,11 @@
mActivity.launchSettingFragment(null, true, mock(Intent.class));
}
+
+ @Test
+ public void testSetTaskDescription_IconChanged() {
+ mActivity.setTaskDescription(mTaskDescription);
+
+ verify(mTaskDescription).setIcon(any());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
index 3ee33aa..bd55fd0 100644
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
@@ -36,8 +36,6 @@
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
-import com.android.settings.applications.InstantDataBuilder.Param;
-import com.android.settings.applications.instantapps.InstantAppDetails;
import com.android.settingslib.applications.ApplicationsState;
import org.junit.Before;
@@ -271,102 +269,27 @@
.isEqualTo(View.GONE);
}
- // Ensure that no instant app related information shows up when the AppHeaderController's
- // InstantAppDetails are null.
+ // Ensure that the instant app label does not show up when we haven't told the controller the
+ // app is instant.
@Test
- public void instantApps_nullInstantAppDetails() {
+ public void instantApps_normalAppsDontGetLabel() {
final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, appHeader);
- mController.setInstantAppDetails(null);
mController.done();
- assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
- .isEqualTo(View.GONE);
- assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
- .isEqualTo(View.GONE);
- assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
+ assertThat(appHeader.findViewById(R.id.install_type).getVisibility())
.isEqualTo(View.GONE);
}
- // Ensure that no instant app related information shows up when the AppHeaderController has
- // a non-null InstantAppDetails, but each member of it is null.
+ // Test that the "instant apps" label is present in the header when we have an instant app.
@Test
- public void instantApps_detailsMembersNull() {
+ public void instantApps_expectedHeaderItem() {
final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
mController = new AppHeaderController(mContext, mFragment, appHeader);
-
- InstantAppDetails details = InstantDataBuilder.build(mContext, EnumSet.noneOf(Param.class));
- mController.setInstantAppDetails(details);
+ mController.setIsInstantApp(true);
mController.done();
- assertThat(appHeader.findViewById(R.id.instant_app_developer_title).getVisibility())
- .isEqualTo(View.GONE);
- assertThat(appHeader.findViewById(R.id.instant_app_maturity).getVisibility())
- .isEqualTo(View.GONE);
- assertThat(appHeader.findViewById(R.id.instant_app_monetization).getVisibility())
- .isEqualTo(View.GONE);
- }
-
- // Helper to assert a TextView for a given id is visible and has a certain string value.
- private void assertVisibleContent(View header, @IdRes int id, String expectedValue) {
- TextView view = (TextView)header.findViewById(id);
- assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(view.getText()).isEqualTo(expectedValue);
- }
-
- // Helper to assert an ImageView for a given id is visible and has a certain Drawable value.
- private void assertVisibleContent(View header, @IdRes int id, Drawable expectedValue) {
- ImageView view = (ImageView)header.findViewById(id);
- assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(view.getDrawable()).isEqualTo(expectedValue);
- }
-
- // Test that expected items are present in the header when we have a complete InstantAppDetails.
- @Test
- public void instantApps_expectedHeaderItems() {
- final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
- mController = new AppHeaderController(mContext, mFragment, header);
-
- InstantAppDetails details = InstantDataBuilder.build(mContext);
- mController.setInstantAppDetails(details);
- mController.done();
-
- assertVisibleContent(header, R.id.instant_app_developer_title, details.developerTitle);
- assertVisibleContent(header, R.id.instant_app_maturity_icon,
- details.maturityRatingIcon);
- assertVisibleContent(header, R.id.instant_app_maturity_text,
- details.maturityRatingString);
- assertVisibleContent(header, R.id.instant_app_monetization,
- details.monetizationNotice);
- }
-
- // Test having each member of InstantAppDetails be null.
- @Test
- public void instantApps_expectedHeaderItemsWithSingleNullMembers() {
- final EnumSet<Param> allParams = EnumSet.allOf(Param.class);
- for (Param paramToRemove : allParams) {
- EnumSet<Param> params = allParams.clone();
- params.remove(paramToRemove);
- final View header = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
- mController = new AppHeaderController(mContext, mFragment, header);
- InstantAppDetails details = InstantDataBuilder.build(mContext, params);
- mController.setInstantAppDetails(details);
- mController.done();
-
- if (params.contains(Param.DEVELOPER_TITLE)) {
- assertVisibleContent(header, R.id.instant_app_developer_title,
- details.developerTitle);
- }
- if (params.contains(Param.MATURITY_RATING_ICON)) {
- assertVisibleContent(header, R.id.instant_app_maturity_icon,
- details.maturityRatingIcon);
- }
- if (params.contains(Param.MATURITY_RATING_STRING)) {
- assertVisibleContent(header, R.id.instant_app_maturity_text,
- details.maturityRatingString);
- }
- if (params.contains(Param.MONETIZATION_NOTICE)) {
- assertVisibleContent(header, R.id.instant_app_monetization,
- details.monetizationNotice);
- }
- }
+ TextView label = (TextView)appHeader.findViewById(R.id.install_type);
+ assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(label.getText()).isEqualTo(
+ appHeader.getResources().getString(R.string.install_type_instant));
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 4cc39fb..56d4a83 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -28,6 +28,8 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import org.junit.Before;
import org.junit.Test;
@@ -37,6 +39,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
@@ -88,7 +91,8 @@
mScreen = mock(PreferenceScreen.class);
mPackageInfo = new PackageInfo();
mPackageInfo.applicationInfo = new ApplicationInfo();
-
+ ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+ (InstantAppDataProvider) (info -> false));
when(mManager.getContext())
.thenReturn(ShadowApplication.getInstance().getApplicationContext());
}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index dc37079..2a703ef 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,22 +16,44 @@
package com.android.settings.applications;
+import android.app.admin.DevicePolicyManager;
import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class InstalledAppDetailsTest {
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private UserManager mUserManager;
+ @Mock
+ private DevicePolicyManager mDevicePolicyManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ }
+
@Test
public void getInstallationStatus_notInstalled_shouldReturnUninstalled() {
final InstalledAppDetails mAppDetail = new InstalledAppDetails();
@@ -60,4 +82,39 @@
assertThat(mAppDetail.getInstallationStatus(info)).isEqualTo(R.string.disabled);
}
+ @Test
+ public void shouldShowUninstallForAll_installForOneOtherUserOnly_shouldReturnTrue() {
+ when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+ when(mUserManager.getUsers().size()).thenReturn(2);
+ final InstalledAppDetails mAppDetail = new InstalledAppDetails();
+ ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+ ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+ final ApplicationInfo info = new ApplicationInfo();
+ info.enabled = true;
+ final AppEntry appEntry = mock(AppEntry.class);
+ appEntry.info = info;
+ final PackageInfo packageInfo = mock(PackageInfo.class);
+ ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+ assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isTrue();
+ }
+
+ @Test
+ public void shouldShowUninstallForAll_installForSelfOnly_shouldReturnFalse() {
+ when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+ when(mUserManager.getUsers().size()).thenReturn(2);
+ final InstalledAppDetails mAppDetail = new InstalledAppDetails();
+ ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
+ ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
+ final ApplicationInfo info = new ApplicationInfo();
+ info.flags = ApplicationInfo.FLAG_INSTALLED;
+ info.enabled = true;
+ final AppEntry appEntry = mock(AppEntry.class);
+ appEntry.info = info;
+ final PackageInfo packageInfo = mock(PackageInfo.class);
+ ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
+
+ assertThat(mAppDetail.shouldShowUninstallForAll(appEntry)).isFalse();
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java b/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java
deleted file mode 100644
index 81ebe06..0000000
--- a/tests/robotests/src/com/android/settings/applications/InstantDataBuilder.java
+++ /dev/null
@@ -1,118 +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.applications;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-
-import com.android.settings.R;
-import com.android.settings.applications.instantapps.InstantAppDetails;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.EnumSet;
-
-/**
- * Utility class for generating fake InstantAppDetails data to use in tests.
- */
-public class InstantDataBuilder {
- public enum Param {
- MATURITY_RATING_ICON,
- MATURITY_RATING_STRING,
- MONETIZATION_NOTICE,
- DEVELOPER_TITLE,
- PRIVACY_POLICY,
- DEVELOPER_WEBSITE,
- DEVELOPER_EMAIL,
- DEVELOPER_MAILING_ADDRESS
- }
-
- /**
- * Creates an InstantAppDetails with any desired combination of null/non-null members.
- *
- * @param context An optional context, required only if MATURITY_RATING_ICON is a member of
- * params
- * @param params Specifies which elements of the returned InstantAppDetails should be non-null
- * @return InstantAppDetails
- */
- public static InstantAppDetails build(@Nullable Context context, EnumSet<Param> params) {
- Drawable ratingIcon = null;
- String rating = null;
- String monetizationNotice = null;
- String developerTitle = null;
- URL privacyPolicy = null;
- URL developerWebsite = null;
- String developerEmail = null;
- String developerMailingAddress = null;
-
- if (params.contains(Param.MATURITY_RATING_ICON)) {
- ratingIcon = context.getDrawable(R.drawable.ic_android);
- }
- if (params.contains(Param.MATURITY_RATING_STRING)) {
- rating = "everyone";
- }
- if (params.contains(Param.MONETIZATION_NOTICE)) {
- monetizationNotice = "Uses in-app purchases";
- }
- if (params.contains(Param.DEVELOPER_TITLE)) {
- developerTitle = "Instant Apps Inc.";
- }
- if (params.contains(Param.DEVELOPER_EMAIL)) {
- developerEmail = "developer@instant-apps.com";
- }
- if (params.contains(Param.DEVELOPER_MAILING_ADDRESS)) {
- developerMailingAddress = "1 Main Street, Somewhere, CA, 94043";
- }
-
- if (params.contains(Param.PRIVACY_POLICY)) {
- try {
- privacyPolicy = new URL("https://test.com/privacy");
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- }
- if (params.contains(Param.DEVELOPER_WEBSITE)) {
- try {
- developerWebsite = new URL("https://test.com");
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- }
-
- return InstantAppDetails.builder()
- .maturityRatingIcon(ratingIcon)
- .maturityRatingString(rating)
- .monetizationNotice(monetizationNotice)
- .developerTitle(developerTitle)
- .privacyPolicy(privacyPolicy)
- .developerWebsite(developerWebsite)
- .developerEmail(developerEmail)
- .developerMailingAddress(developerMailingAddress)
- .build();
- }
-
- /**
- * Convenience method to create an InstantAppDetails with all non-null members.
- *
- * @param context a required Context for loading a test maturity rating icon
- * @return InstantAppDetails
- */
- public static InstantAppDetails build(Context context) {
- return build(context, EnumSet.allOf(Param.class));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 1a0f3fa..a7772bb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -15,6 +15,7 @@
*/
package com.android.settings.fuelgauge;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.PowerManager;
@@ -27,10 +28,12 @@
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.os.BatteryStatsImpl;
import com.android.settings.R;
+import com.android.settings.SettingsActivity;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.Utils;
@@ -52,6 +55,7 @@
import static com.android.settings.fuelgauge.PowerUsageBase.MENU_STATS_REFRESH;
import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
+import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
@@ -95,6 +99,8 @@
@Mock
private MenuItem mToggleAppsMenu;
@Mock
+ private MenuItem mHighPowerMenu;
+ @Mock
private MenuInflater mMenuInflater;
@Mock
private BatterySipper mNormalBatterySipper;
@@ -128,6 +134,8 @@
private BatteryStatsHelper mBatteryHelper;
@Mock
private PowerManager mPowerManager;
+ @Mock
+ private SettingsActivity mSettingsActivity;
private List<BatterySipper> mUsageList;
private Context mRealContext;
@@ -145,10 +153,12 @@
mFragment = spy(new TestFragment(mContext));
mFragment.initFeatureProvider();
-
+
+ when(mFragment.getActivity()).thenReturn(mSettingsActivity);
when(mAdditionalBatteryInfoMenu.getItemId())
.thenReturn(MENU_ADDITIONAL_BATTERY_INFO);
when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);
+ when(mHighPowerMenu.getItemId()).thenReturn(MENU_HIGH_POWER_APPS);
when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
.thenReturn(ADDITIONAL_BATTERY_INFO_INTENT);
when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
@@ -216,6 +226,31 @@
}
@Test
+ public void testOptionsMenu_MenuHighPower_MetricEventInvoked() {
+ mFragment.onOptionsItemSelected(mHighPowerMenu);
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+ MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
+ }
+
+ @Test
+ public void testOptionsMenu_MenuAdditionalBattery_MetricEventInvoked() {
+ mFragment.onOptionsItemSelected(mAdditionalBatteryInfoMenu);
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+ MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
+ }
+
+ @Test
+ public void testOptionsMenu_MenuAppToggle_MetricEventInvoked() {
+ mFragment.onOptionsItemSelected(mToggleAppsMenu);
+ mFragment.mShowAllApps = false;
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+ MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, true);
+ }
+
+ @Test
public void testOptionsMenu_ToggleAppsEnabled() {
when(mFeatureFactory.powerUsageFeatureProvider.isPowerAccountingToggleEnabled())
.thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
new file mode 100644
index 0000000..7c1d587
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -0,0 +1,40 @@
+/*
+ * 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.support;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SupportConfigTest {
+
+ @Test
+ public void getConfigForSupportFeature_shouldBeDisabled() {
+ final boolean supportEnabled = RuntimeEnvironment.application.getResources()
+ .getBoolean(R.bool.config_support_enabled);
+ assertThat(supportEnabled).isFalse();
+ }
+}
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 cc55a4e..181ae64 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -56,6 +56,10 @@
// TODO: Remove this once Robolectric is updated.
if (id == com.android.settings.R.drawable.switchbar_background) {
return new ColorDrawable();
+ } else if (id == com.android.settings.R.drawable.ic_launcher_settings) {
+ // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
+ // change it to a normal drawable.
+ id = com.android.settings.R.drawable.ic_settings_wireless;
}
return super.loadDrawable(value, id, theme);
}