Merge "Remove Gesture settings as inline results"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 22c2c59..0501077 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2296,6 +2296,18 @@
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
+ <activity android:name="Settings$ManagedProfileSettingsActivity"
+ android:label="@string/managed_profile_settings_title"
+ android:taskAffinity=""
+ android:parentActivityName="Settings"
+ android:permission="android.permission.MANAGE_USERS">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.MANAGED_PROFILE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.accounts.ManagedProfileSettings" />
+ </activity>
<activity android:name="com.android.settings.accounts.AddAccountSettings"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6bab594..fcb57ad 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2939,7 +2939,7 @@
<string name="tether_settings_title_bluetooth">Bluetooth tethering</string>
<!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
<string name="tether_settings_title_usb_bluetooth">Tethering</string>
- <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+ <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=50]-->
<string name="tether_settings_title_all">Hotspot & Tethering</string>
<!-- Tethering setting summary when both Wi-Fi hotspot and tether are turned on [CHAR LIMIT=NONE]-->
<string name="tether_settings_summary_hotspot_on_tether_on">Hotspot on, tethering</string>
@@ -5991,7 +5991,9 @@
handle actions such as open web page, making phone calls, default SMS apps [CHAR LIMIT=40]-->
<string name="app_default_dashboard_title">Default apps</string>
<!-- Summary text for system preference tile, showing important setting items under system setting [CHAR LIMIT=NONE]-->
- <string name="system_dashboard_summary">Languages, backup, updates, about phone</string>
+ <string name="system_dashboard_summary" product="default">Languages, backup, updates, about phone</string>
+ <!-- Summary text for system preference tile, showing important setting items under system setting [CHAR LIMIT=NONE]-->
+ <string name="system_dashboard_summary" product="tablet">Languages, backup, updates, about device</string>
<!-- Search strings -->
<!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index a5f9830..40972ac 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -366,13 +366,22 @@
}
}
+ /**
+ * Dialog setup.
+ * <p>
+ * To make it less likely that the dialog is dismissed accidentally, for example if the
+ * device is malfunctioning or if the device is in a pocket, we set
+ * {@code setCanceledOnTouchOutside(false)}.
+ */
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- return new AlertDialog.Builder(getActivity())
+ Dialog dialog = new AlertDialog.Builder(getActivity())
.setTitle(getArguments().getString(ARG_TITLE))
.setMessage(getArguments().getInt(ARG_MESSAGE))
.setPositiveButton(getArguments().getInt(ARG_BUTTON), null)
.create();
+ dialog.setCanceledOnTouchOutside(false);
+ return dialog;
}
@Override
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 726bf0a..56ab34a 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -39,7 +39,9 @@
import android.widget.ImageView;
import android.widget.ListView;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.Settings.TetherSettingsActivity;
+import com.android.settings.overlay.FeatureFactory;
import java.util.ArrayList;
import java.util.List;
@@ -56,7 +58,8 @@
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
- ListItem item = itemForPosition(position);
+ final ListItem item = itemForPosition(position);
+ logCreateShortcut(item.resolveInfo);
setResult(RESULT_OK, createResultIntent(intentForPosition(position),
item.resolveInfo, item.label));
finish();
@@ -89,6 +92,15 @@
return intent;
}
+ private void logCreateShortcut(ResolveInfo info) {
+ if (info == null || info.activityInfo == null) {
+ return;
+ }
+ FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(
+ this, MetricsProto.MetricsEvent.ACTION_SETTINGS_CREATE_SHORTCUT,
+ info.activityInfo.name);
+ }
+
private Bitmap createIcon(int resource) {
Context context = new ContextThemeWrapper(this, android.R.style.Theme_Material);
View view = LayoutInflater.from(context).inflate(R.layout.shortcut_badge, null);
@@ -165,7 +177,7 @@
continue;
}
updates.add(new ShortcutInfo.Builder(mContext, info.getId())
- .setShortLabel(ri.loadLabel(pm)).build());
+ .setShortLabel(ri.loadLabel(pm)).build());
}
if (!updates.isEmpty()) {
sm.updateShortcuts(updates);
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ddf0dec..eeb4779 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1164,7 +1164,7 @@
void setImsConfigProvisionedState(int configItem, boolean state) {
if (phone != null && mImsManager != null) {
- QueuedWork.queue(new Runnable() {
+ QueuedWork.singleThreadExecutor().submit(new Runnable() {
public void run() {
try {
mImsManager.getConfigInterface().setProvisionedValue(
@@ -1174,7 +1174,7 @@
Log.e(TAG, "setImsConfigProvisioned() exception:", e);
}
}
- }, false);
+ });
}
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 179b31b..51613c7 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -69,7 +69,6 @@
import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.Tile;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java
index 8c00be9..156631c 100644
--- a/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -31,6 +31,7 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -97,7 +98,8 @@
}
}
}
- return null;
+ // Return default managed profile for the current user.
+ return Utils.getManagedProfile(mUserManager);
}
private void loadDataAndPopulateUi() {
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 146e1ff..d5f7f78 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -381,6 +381,8 @@
AppFilter filter = new VolumeFilter(mVolumeUuid);
if (mStorageType == STORAGE_TYPE_MUSIC) {
filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
+ } else {
+ filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
}
mApplications.setOverrideFilter(filter);
}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 372a353..b6285ad 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -15,6 +15,7 @@
*/
package com.android.settings.dashboard;
+import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.TypedArray;
@@ -28,7 +29,6 @@
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
-import android.util.TypedValue;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -61,15 +61,17 @@
private final IconCache mCache;
private final Context mContext;
private final MetricsFeatureProvider mMetricsFeatureProvider;
+ private final DashboardFeatureProvider mDashboardFeatureProvider;
private SuggestionParser mSuggestionParser;
- @VisibleForTesting DashboardData mDashboardData;
+ @VisibleForTesting
+ DashboardData mDashboardData;
private View.OnClickListener mTileClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
//TODO: get rid of setTag/getTag
- ((SettingsActivity) mContext).openTile((Tile) v.getTag());
+ mDashboardFeatureProvider.openTileIntent((Activity) mContext, (Tile) v.getTag());
}
};
@@ -105,6 +107,8 @@
mContext = context;
mMetricsFeatureProvider = metricsFeatureProvider;
+ mDashboardFeatureProvider = FeatureFactory.getFactory(context)
+ .getDashboardFeatureProvider(context);
mCache = new IconCache(context);
mSuggestionParser = parser;
@@ -132,9 +136,9 @@
public void setCategoriesAndSuggestions(List<DashboardCategory> categories,
List<Tile> suggestions) {
// TODO: Better place for tinting?
- final TypedArray a = mContext.obtainStyledAttributes(new int[] {
- FeatureFactory.getFactory(mContext).getDashboardFeatureProvider(mContext).isEnabled()
- ? android.R.attr.colorControlNormal : android.R.attr.colorAccent });
+ final TypedArray a = mContext.obtainStyledAttributes(new int[]{
+ mDashboardFeatureProvider.isEnabled()
+ ? android.R.attr.colorControlNormal : android.R.attr.colorAccent});
int tintColor = a.getColor(0, mContext.getColor(android.R.color.white));
a.recycle();
for (int i = 0; i < categories.size(); i++) {
@@ -405,12 +409,10 @@
final List<Tile> suggestions = mDashboardData.getSuggestions();
final List<DashboardCategory> categories = mDashboardData.getCategories();
if (suggestions != null) {
- outState.putParcelableArrayList(STATE_SUGGESTION_LIST,
- new ArrayList<Tile>(suggestions));
+ outState.putParcelableArrayList(STATE_SUGGESTION_LIST, new ArrayList<>(suggestions));
}
if (categories != null) {
- outState.putParcelableArrayList(STATE_CATEGORY_LIST,
- new ArrayList<DashboardCategory>(categories));
+ outState.putParcelableArrayList(STATE_CATEGORY_LIST, new ArrayList<>(categories));
}
outState.putInt(STATE_SUGGESTION_MODE, mDashboardData.getSuggestionMode());
}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 2a5e800..7f91d16 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -93,4 +93,9 @@
*/
String getExtraIntentAction();
+ /**
+ * Opens a tile to its destination intent.
+ */
+ void openTileIntent(Activity activity, Tile tile);
+
}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 08372b0..223d050 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -21,15 +21,20 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsActivity;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.drawer.CategoryManager;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.ProfileSelectDialog;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.Tile;
import java.util.ArrayList;
@@ -47,18 +52,20 @@
protected final Context mContext;
-
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
private final CategoryManager mCategoryManager;
public DashboardFeatureProviderImpl(Context context) {
mContext = context.getApplicationContext();
mCategoryManager = CategoryManager.get(context, getExtraIntentAction());
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@VisibleForTesting
DashboardFeatureProviderImpl(Context context, CategoryManager categoryManager) {
mContext = context.getApplicationContext();
mCategoryManager = categoryManager;
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@Override
@@ -149,14 +156,7 @@
intent.setAction(action);
}
pref.setOnPreferenceClickListener(preference -> {
- ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
- if (tile.userHandle == null) {
- activity.startActivityForResult(intent, 0);
- } else if (tile.userHandle.size() == 1) {
- activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
- } else {
- ProfileSelectDialog.show(activity.getFragmentManager(), tile);
- }
+ launchIntentOrSelectProfile(activity, tile, intent);
return true;
});
}
@@ -188,4 +188,48 @@
public String getExtraIntentAction() {
return null;
}
+
+ @Override
+ public void openTileIntent(Activity activity, Tile tile) {
+ if (tile == null) {
+ Intent intent = new Intent(Settings.ACTION_SETTINGS).addFlags(
+ Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ mContext.startActivity(intent);
+ return;
+ }
+
+ if (tile.intent == null) {
+ return;
+ }
+ final Intent intent = new Intent(tile.intent)
+ .putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ launchIntentOrSelectProfile(activity, tile, intent);
+ }
+
+ private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent) {
+ ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
+ if (tile.userHandle == null) {
+ logStartActivity(intent);
+ activity.startActivityForResult(intent, 0);
+ } else if (tile.userHandle.size() == 1) {
+ logStartActivity(intent);
+ activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
+ } else {
+ ProfileSelectDialog.show(activity.getFragmentManager(), tile);
+ }
+ }
+
+ private void logStartActivity(Intent intent) {
+ if (intent == null) {
+ return;
+ }
+ final ComponentName cn = intent.getComponent();
+ if (cn == null) {
+ return;
+ }
+ mMetricsFeatureProvider.action(mContext,
+ MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK,
+ cn.flattenToString());
+ }
}
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index c5125bd..0cc2688 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -129,7 +129,7 @@
mContext = context;
mIndex = index;
- PACKAGE_CHANGE_MONITOR.register(context);
+ PACKAGE_CHANGE_MONITOR.registerMonitor(context);
mHasFeaturePrinting = context.getPackageManager()
.hasSystemFeature(PackageManager.FEATURE_PRINTING);
if (mHasFeaturePrinting) {
@@ -154,7 +154,7 @@
public void unregister(Activity activity, int loaderId) {
if (mIndex == null) return;
- PACKAGE_CHANGE_MONITOR.unregister();
+ PACKAGE_CHANGE_MONITOR.unregisterMonitor();
if (mHasFeaturePrinting) {
activity.getLoaderManager().destroyLoader(loaderId);
}
@@ -240,15 +240,31 @@
private static class PackageChangeMonitor extends PackageMonitor {
private static final String TAG = PackageChangeMonitor.class.getSimpleName();
- // Null if not initialized.
+ // Null if not initialized. Guarded by {@link #mLock}.
@Nullable private PackageManager mPackageManager;
+ private final Object mLock = new Object();
- public void register(Context context) {
- mPackageManager = context.getPackageManager();
+ public void registerMonitor(Context context) {
+ synchronized (mLock) {
+ if (mPackageManager != null) {
+ return;
+ }
+ mPackageManager = context.getPackageManager();
- // Start tracking packages. Use background thread for monitoring. Note that no need to
- // unregister this monitor. This should be alive while Settings app is running.
- register(context, null /* thread */, UserHandle.CURRENT, false);
+ // Start tracking packages. Use background thread for monitoring. Note that no need
+ // to unregister this monitor. This should be alive while Settings app is running.
+ super.register(context, null /* thread */, UserHandle.CURRENT, false);
+ }
+ }
+
+ public void unregisterMonitor() {
+ synchronized (mLock) {
+ if (mPackageManager == null) {
+ return;
+ }
+ super.unregister();
+ mPackageManager = null;
+ }
}
// Covers installed, appeared external storage with the package, upgraded.
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 917c336..af720cb 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -27,9 +27,11 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.CategoryManager;
import com.android.settingslib.drawer.DashboardCategory;
@@ -50,6 +52,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -67,12 +70,15 @@
private UserManager mUserManager;
@Mock
private CategoryManager mCategoryManager;
+ private FakeFeatureFactory mFeatureFactory;
private DashboardFeatureProviderImpl mImpl;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest(mActivity);
+ mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
mImpl = new DashboardFeatureProviderImpl(mActivity);
}
@@ -141,6 +147,30 @@
}
@Test
+ public void bindPreference_noFragmentMetadataSingleUser_shouldBindToDirectLaunchIntent() {
+ final Preference preference = new Preference(
+ ShadowApplication.getInstance().getApplicationContext());
+ final Tile tile = new Tile();
+ tile.metaData = new Bundle();
+ tile.userHandle = new ArrayList<>();
+ tile.userHandle.add(mock(UserHandle.class));
+ tile.intent = new Intent();
+ tile.intent.setComponent(new ComponentName("pkg", "class"));
+
+ when(mActivity.getSystemService(Context.USER_SERVICE))
+ .thenReturn(mUserManager);
+
+ mImpl.bindPreferenceToTile(mActivity, preference, tile, "123", Preference.DEFAULT_ORDER);
+ preference.getOnPreferenceClickListener().onPreferenceClick(null);
+ verify(mFeatureFactory.metricsFeatureProvider).action(
+ any(Context.class),
+ eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
+ eq(tile.intent.getComponent().flattenToString()));
+ verify(mActivity)
+ .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
+ }
+
+ @Test
public void bindPreference_withNullKeyNullPriority_shouldGenerateKeyAndPriority() {
final Preference preference = new Preference(
ShadowApplication.getInstance().getApplicationContext());