Merge "Import translations. DO NOT MERGE" into oc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d5a4189..019712d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6360,6 +6360,12 @@
<!-- Sound: Title for the option defining the default notification sound. [CHAR LIMIT=30] -->
<string name="notification_ringtone_title">Default notification sound</string>
+ <!-- Sound: Sound title for apps that have not provided a title. [CHAR LIMIT=30] -->
+ <string name="notification_unknown_sound_title">App provided sound</string>
+
+ <!-- Notification sound summary when chosen sound is the system default. -->
+ <string name="notification_sound_default">Default notification sound</string>
+
<!-- Sound: Title for the option defining the default alarm sound. [CHAR LIMIT=30] -->
<string name="alarm_ringtone_title">Default alarm sound</string>
@@ -8622,9 +8628,16 @@
<string name="autofill_app">Autofill service</string>
<!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->
<string name="autofill_keywords">auto, fill, autofill</string>
- <!-- Title of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->
+
+ <!-- Message of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->
<string name="autofill_confirmation_message">
- Make <xliff:g id="app_name">%1$s</xliff:g> your autofill app? <xliff:g id="app_name">%1$s</xliff:g> will be able to read your screen and fill fields in other apps.
+ <![CDATA[
+ <b>Make sure you trust this app</b>
+ <br/>
+ <br/>
+ <xliff:g id="app_name" example="Google Autofill">%1$s</xliff:g> uses what\'s on
+ your screen to determine what can be autofilled.
+ ]]>
</string>
<!-- Name of setting for switching device theme [CHAR LIMIT=60] -->
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index 5b848e6..ccaa724 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -32,10 +32,12 @@
android:title="@string/notification_importance_title" />
<!-- Default ringtone -->
- <com.android.settings.notification.DefaultNotificationTonePreference
+ <com.android.settings.notification.NotificationSoundPreference
android:key="ringtone"
- android:title="@string/notification_ringtone_title"
- android:dialogTitle="@string/notification_ringtone_title"
+ android:title="@string/notification_channel_sound_title"
+ android:dialogTitle="@string/notification_channel_sound_title"
+ android:showSilent="true"
+ android:showDefault="true"
android:ringtoneType="notification" />
<!-- Vibration -->
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 823c970..9f9f832 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -19,40 +19,15 @@
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.media.RingtoneManager;
-import android.os.UserHandle;
-import android.os.UserManager;
import android.net.Uri;
import android.util.AttributeSet;
-import android.util.Log;
public class DefaultRingtonePreference extends RingtonePreference {
private static final String TAG = "DefaultRingtonePreference";
- private int mUserId = UserHandle.USER_CURRENT;
- protected Context mUserContext;
-
public DefaultRingtonePreference(Context context, AttributeSet attrs) {
super(context, attrs);
- mUserContext = getContext();
- }
-
- public void setUserId(int userId) {
- mUserId = userId;
- mUserContext = Utils.createPackageContextAsUser(getContext(), mUserId);
- }
-
- @Override
- public void performClick() {
- if (mUserId != UserHandle.USER_CURRENT) {
- if (Utils.confirmWorkProfileCredentialsIfNecessary(getContext(), mUserId) ||
- Utils.startQuietModeDialogIfNecessary(getContext(),
- UserManager.get(getContext()), mUserId)) {
- return;
- }
- }
- super.performClick();
}
@Override
@@ -64,9 +39,6 @@
* doesn't make sense to show a 'Default' item.
*/
ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false);
- if (mUserId != UserHandle.USER_CURRENT) {
- ringtonePickerIntent.putExtra(Intent.EXTRA_USER_ID, mUserId);
- }
}
@Override
diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java
index 41318f0..52ab65b 100644
--- a/src/com/android/settings/RingtonePreference.java
+++ b/src/com/android/settings/RingtonePreference.java
@@ -22,6 +22,7 @@
import android.media.AudioAttributes;
import android.media.RingtoneManager;
import android.net.Uri;
+import android.os.UserHandle;
import android.provider.Settings.System;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceManager;
@@ -54,6 +55,8 @@
private boolean mShowSilent;
private int mRequestCode;
+ protected int mUserId;
+ protected Context mUserContext;
public RingtonePreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -67,9 +70,19 @@
mShowSilent = a.getBoolean(com.android.internal.R.styleable.RingtonePreference_showSilent,
true);
setIntent(new Intent(RingtoneManager.ACTION_RINGTONE_PICKER));
+ setUserId(UserHandle.myUserId());
a.recycle();
}
+ public void setUserId(int userId) {
+ mUserId = userId;
+ mUserContext = Utils.createPackageContextAsUser(getContext(), mUserId);
+ }
+
+ public int getUserId() {
+ return mUserId;
+ }
+
/**
* Returns the sound type(s) that are shown in the picker.
*
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index c6dc7a7..37a32d5 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Point;
+import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnPreparedListener;
import android.net.Uri;
@@ -76,6 +77,9 @@
}
});
+ // Make sure the VideoView does not request audio focus.
+ videoView.setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE);
+
// Resolve and set the video content
Bundle args = getArguments();
if ((args != null) && args.containsKey(
@@ -85,6 +89,7 @@
getPrefContext().getPackageName(),
args.getInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID))));
}
+
// Make sure video controls (e.g. for pausing) are not displayed.
videoView.setMediaController(null);
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 98557ee..9ab704e 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -50,7 +50,7 @@
@Override
public void onRadioButtonClicked(RadioButtonPreference selected) {
final String selectedKey = selected.getKey();
- final String confirmationMessage = getConfirmationMessage(getCandidate(selectedKey));
+ final CharSequence confirmationMessage = getConfirmationMessage(getCandidate(selectedKey));
final Activity activity = getActivity();
if (TextUtils.isEmpty(confirmationMessage)) {
super.onRadioButtonClicked(selected);
@@ -74,7 +74,7 @@
}
}
- protected String getConfirmationMessage(CandidateInfo info) {
+ protected CharSequence getConfirmationMessage(CandidateInfo info) {
return null;
}
@@ -91,11 +91,11 @@
}
public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
- String key, String message) {
+ String key, CharSequence message) {
final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
final Bundle argument = new Bundle();
argument.putString(EXTRA_KEY, key);
- argument.putString(EXTRA_MESSAGE, message);
+ argument.putCharSequence(EXTRA_MESSAGE, message);
fragment.setArguments(argument);
fragment.setTargetFragment(parent, 0);
return fragment;
@@ -105,7 +105,7 @@
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Bundle bundle = getArguments();
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
- .setMessage(bundle.getString(EXTRA_MESSAGE))
+ .setMessage(bundle.getCharSequence(EXTRA_MESSAGE))
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, null);
return builder.create();
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index d943de7..8eb1fc6 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -24,6 +24,7 @@
import android.provider.Settings;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo;
+import android.text.Html;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
@@ -65,12 +66,14 @@
}
@Override
- protected String getConfirmationMessage(CandidateInfo appInfo) {
+ protected CharSequence getConfirmationMessage(CandidateInfo appInfo) {
if (appInfo == null) {
return null;
}
final CharSequence appName = appInfo.loadLabel();
- return getContext().getString(R.string.autofill_confirmation_message, appName);
+ final String message = getContext().getString(
+ R.string.autofill_confirmation_message, appName);
+ return Html.fromHtml(message);
}
@Override
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index b24e92c..bec4845 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -21,7 +21,6 @@
import static android.app.NotificationManager.IMPORTANCE_MIN;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-import android.app.Activity;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -29,7 +28,6 @@
import android.content.Intent;
import android.content.pm.UserInfo;
import android.net.Uri;
-import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.notification.NotificationListenerService.Ranking;
@@ -63,7 +61,7 @@
protected RestrictedSwitchPreference mLights;
protected RestrictedSwitchPreference mVibrate;
- protected DefaultNotificationTonePreference mRingtone;
+ protected NotificationSoundPreference mRingtone;
protected RestrictedDropDownPreference mImportance;
protected RestrictedSwitchPreference mPriority;
protected RestrictedDropDownPreference mVisibilityOverride;
@@ -102,7 +100,7 @@
(RestrictedDropDownPreference) findPreference(KEY_VISIBILITY_OVERRIDE);
mLights = (RestrictedSwitchPreference) findPreference(KEY_LIGHTS);
mVibrate = (RestrictedSwitchPreference) findPreference(KEY_VIBRATE);
- mRingtone = (DefaultNotificationTonePreference) findPreference(KEY_RINGTONE);
+ mRingtone = (NotificationSoundPreference) findPreference(KEY_RINGTONE);
if (mPkgInfo != null && mChannel != null) {
setupPriorityPref(mChannel.canBypassDnd());
diff --git a/src/com/android/settings/notification/NotificationSoundPreference.java b/src/com/android/settings/notification/NotificationSoundPreference.java
new file mode 100644
index 0000000..51b235d
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationSoundPreference.java
@@ -0,0 +1,54 @@
+package com.android.settings.notification;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.util.AttributeSet;
+
+import com.android.settings.R;
+import com.android.settings.RingtonePreference;
+
+public class NotificationSoundPreference extends RingtonePreference {
+ private Uri mRingtone;
+
+ public NotificationSoundPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected Uri onRestoreRingtone() {
+ return mRingtone;
+ }
+
+ public void setRingtone(Uri ringtone) {
+ mRingtone = ringtone;
+ updateRingtoneName(mRingtone);
+ }
+
+ private void updateRingtoneName(final Uri uri) {
+ AsyncTask ringtoneNameTask = new AsyncTask<Object, Void, CharSequence>() {
+ @Override
+ protected CharSequence doInBackground(Object... params) {
+ if (uri == null) {
+ return getContext().getString(com.android.internal.R.string.ringtone_silent);
+ } else if (RingtoneManager.isDefault(uri)) {
+ return getContext().getString(R.string.notification_sound_default);
+ } else if(ContentResolver.SCHEME_ANDROID_RESOURCE.equals(uri.getScheme())) {
+ return getContext().getString(R.string.notification_unknown_sound_title);
+ } else {
+ return Ringtone.getTitle(getContext(), uri, false /* followSettingsUri */,
+ true /* allowRemote */);
+ }
+ }
+
+ @Override
+ protected void onPostExecute(CharSequence name) {
+ setSummary(name);
+ }
+ };
+ ringtoneNameTask.execute();
+ }
+}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 79a8970..552c4d3 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -22,6 +22,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.UserHandle;
import android.preference.SeekBarVolumizer;
import android.provider.SearchIndexableResource;
import android.support.v7.preference.Preference;
@@ -85,7 +86,11 @@
if (preference instanceof RingtonePreference) {
mRequestPreference = (RingtonePreference) preference;
mRequestPreference.onPrepareRingtonePickerIntent(mRequestPreference.getIntent());
- startActivityForResult(preference.getIntent(), REQUEST_CODE);
+ startActivityForResultAsUser(
+ mRequestPreference.getIntent(),
+ REQUEST_CODE,
+ null,
+ UserHandle.of(mRequestPreference.getUserId()));
return true;
}
return super.onPreferenceTreeClick(preference);
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
index d996750..520e1f0 100644
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
@@ -27,6 +27,7 @@
import com.android.settings.DefaultRingtonePreference;
import com.android.settings.R;
+import com.android.settings.RingtonePreference;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -251,4 +252,26 @@
verify(mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE))
.setSummary(eq(notAvailable));
}
+
+ @Test
+ public void onResume_shouldSetUserIdToPreference() {
+ final int managedProfileUserId = 10;
+ when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+ .thenReturn(managedProfileUserId);
+ when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+ when(mAudioHelper.isSingleVolume()).thenReturn(false);
+ when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+ when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
+
+ mController.displayPreference(mScreen);
+ mController.onResume();
+
+ verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE))
+ .setUserId(managedProfileUserId);
+ verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_NOTIFICATION_RINGTONE))
+ .setUserId(managedProfileUserId);
+ verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE))
+ .setUserId(managedProfileUserId);
+ }
+
}