Merge "Fix pref availability for search" into nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6ba161e..d5fe301 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1732,6 +1732,7 @@
android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name=".SetupEncryptionInterstitial"
+ android:label="@string/encryption_interstitial_header"
android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index fa7a63b..a588ed4 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -51,7 +51,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Small"
- android:textColor="?android:attr/textColorSecondary" />
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:paddingEnd="@dimen/dashboard_tile_image_margin_start" />
</LinearLayout>
diff --git a/res/layout/preference_importance_slider.xml b/res/layout/preference_importance_slider.xml
index dc7c9db..ddbcd30 100644
--- a/res/layout/preference_importance_slider.xml
+++ b/res/layout/preference_importance_slider.xml
@@ -58,8 +58,8 @@
android:focusable="true"
android:background="#00ffffff"
android:progressBackgroundTint="@color/importance_secondary_slider_color"
- android:thumbTint="@color/importance_disabled_slider_color"
- android:progressTint="@color/importance_disabled_slider_color"
+ android:thumbTint="@color/importance_slider_color"
+ android:progressTint="@color/importance_slider_color"
style="@android:style/Widget.Material.SeekBar.Discrete"
android:tickMarkTint="@android:color/black" />
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b9748ed..72c76e6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -3000,7 +3000,7 @@
<string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
<string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
<string name="cell_data_template" msgid="3308709914705592281">"Datos móviles: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="wifi_data_template" msgid="501654649753761778">"Datos de Wi-Fi: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de datos con Wi-Fi"</string>
<string name="ethernet_data_template" msgid="5775729859383597507">"Datos de Ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="cell_warning_only" msgid="763147658209027140">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 30766fc..ba35cfb 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -2347,7 +2347,7 @@
<string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ဤအစီအမံသည် ဤတက်ဘလက်မှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
<string name="global_change_warning" product="default" msgid="2461264421590324675">"ဤဆက်တင်းသည် ဤဖုန်းမှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
<string name="global_locale_change_title" msgid="5956281361384221451">"ဘာသာစကားပြောင်းရန်"</string>
- <string name="nfc_payment_settings_title" msgid="1807298287380821613">"တို့ထိပေးစနစ်"</string>
+ <string name="nfc_payment_settings_title" msgid="1807298287380821613">"တို့ထိပေးစနစ်"</string>
<string name="nfc_payment_how_it_works" msgid="3028822263837896720">"အဲဒါ အလုပ် လုပ်ပုံ"</string>
<string name="nfc_payment_no_apps" msgid="5477904979148086424">"စတိုးဆိုင်များတွင် သင်၏ ဖုန်းဖြင့် ငွေပေးချေပါ"</string>
<string name="nfc_payment_default" msgid="8648420259219150395">"အလိုအလျောက် ငွေချေမှု"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 5b593d1..c8864e0 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -2318,7 +2318,7 @@
<string name="user_confirm_remove_title" msgid="1163721647646152032">"இவரை அகற்றவா?"</string>
<string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"இதை அகற்றவா?"</string>
<string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"பணி சுயவிவரத்தை அகற்றவா?"</string>
- <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"இந்த டேப்லெட்டில் உங்களுக்கான சேமிப்பிடம் மற்றும் தரவை நீங்கள் இழக்க நேரிடும். இதை நீங்கள் மாற்ற முடியாது."</string>
+ <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"இந்த டேப்லெட்டில் உங்களுக்கான சேமிப்பிடம் மற்றும் தரவை இழக்க நேரிடும். இதை மாற்ற முடியாது."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"இந்த மொபைலில் உங்களுக்கான சேமிப்பிடம், தரவை இழக்க நேரிடும். இதை மாற்ற முடியாது."</string>
<string name="user_confirm_remove_message" msgid="1020629390993095037">"எல்லா பயன்பாடுகளும் தரவும் நீக்கப்படும்."</string>
<string name="work_profile_confirm_remove_message" msgid="323856589749078140">"தொடர்ந்தால், இந்தச் சுயவிவரத்தில் உள்ள எல்லா பயன்பாடுகளும் தகவலும் நீக்கப்படும்."</string>
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 6cdf0b9..eed380b 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -103,16 +103,11 @@
static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
private static final int CONFIRM_KEY_GUARD_REQUEST = 1;
+ private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 2;
private final KeyStore mKeyStore = KeyStore.getInstance();
/**
- * The UIDs that are used for system credential storage in keystore.
- */
- private static final int[] SYSTEM_CREDENTIAL_UIDS = {Process.WIFI_UID, Process.VPN_UID,
- Process.ROOT_UID, Process.SYSTEM_UID};
-
- /**
* When non-null, the bundle containing credentials to install.
*/
private Bundle mInstallBundle;
@@ -197,7 +192,7 @@
return;
}
// force key guard confirmation
- if (confirmKeyGuard()) {
+ if (confirmKeyGuard(CONFIRM_KEY_GUARD_REQUEST)) {
// will return password value via onActivityResult
return;
}
@@ -328,8 +323,10 @@
@Override public void onDismiss(DialogInterface dialog) {
if (mResetConfirmed) {
mResetConfirmed = false;
- new ResetKeyStoreAndKeyChain().execute();
- return;
+ if (confirmKeyGuard(CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST)) {
+ // will return password value via onActivityResult
+ return;
+ }
}
finish();
}
@@ -343,12 +340,7 @@
@Override protected Boolean doInBackground(Void... unused) {
// Clear all the users credentials could have been installed in for this user.
- final UserManager um = (UserManager) getSystemService(USER_SERVICE);
- for (int userId : um.getProfileIdsWithDisabled(UserHandle.myUserId())) {
- for (int uid : SYSTEM_CREDENTIAL_UIDS) {
- mKeyStore.clearUid(UserHandle.getUid(userId, uid));
- }
- }
+ new LockPatternUtils(CredentialStorage.this).resetKeyStore(UserHandle.myUserId());
try {
KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);
@@ -454,10 +446,10 @@
/**
* Confirm existing key guard, returning password via onActivityResult.
*/
- private boolean confirmKeyGuard() {
+ private boolean confirmKeyGuard(int requestCode) {
Resources res = getResources();
boolean launched = new ChooseLockSettingsHelper(this)
- .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
+ .launchConfirmationActivity(requestCode,
res.getText(R.string.credentials_title), true);
return launched;
}
@@ -481,6 +473,13 @@
}
// failed confirmation, bail
finish();
+ } else if (requestCode == CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST) {
+ if (resultCode == Activity.RESULT_OK) {
+ new ResetKeyStoreAndKeyChain().execute();
+ return;
+ }
+ // failed confirmation, bail
+ finish();
}
}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 18b941c..e08173f 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -87,7 +87,7 @@
mSummaryLoader = new SummaryLoader(getActivity(), categories);
setHasOptionsMenu(true);
Context context = getContext();
- mConditionManager = ConditionManager.get(context);
+ mConditionManager = ConditionManager.get(context, false);
mSuggestionParser = new SuggestionParser(context,
context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
mSuggestionsChecks = new SuggestionsChecks(getContext());
diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java
index f38bb2a..ad0e839 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionManager.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionManager.java
@@ -54,10 +54,15 @@
private final ArrayList<ConditionListener> mListeners = new ArrayList<>();
- private ConditionManager(Context context) {
+ private ConditionManager(Context context, boolean loadConditionsNow) {
mContext = context;
mConditions = new ArrayList<>();
- new ConditionLoader().execute();
+ if (loadConditionsNow) {
+ ConditionLoader loader = new ConditionLoader();
+ loader.onPostExecute(loader.doInBackground());
+ } else {
+ new ConditionLoader().execute();
+ }
}
public void refreshAll() {
@@ -241,8 +246,12 @@
}
public static ConditionManager get(Context context) {
+ return get(context, true);
+ }
+
+ public static ConditionManager get(Context context, boolean loadConditionsNow) {
if (sInstance == null) {
- sInstance = new ConditionManager(context.getApplicationContext());
+ sInstance = new ConditionManager(context.getApplicationContext(), loadConditionsNow);
}
return sInstance;
}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 41cee97..e0dc389 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -149,10 +149,15 @@
} catch (PackageManager.NameNotFoundException e) {
}
}
- mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
- mRestrictBackground.setOnPreferenceChangeListener(this);
- mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
- mUnrestrictedData.setOnPreferenceChangeListener(this);
+ if (mAppItem.key == Process.SYSTEM_UID) {
+ removePreference(KEY_UNRESTRICTED_DATA);
+ removePreference(KEY_RESTRICT_BACKGROUND);
+ } else {
+ mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
+ mRestrictBackground.setOnPreferenceChangeListener(this);
+ mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
+ mUnrestrictedData.setOnPreferenceChangeListener(this);
+ }
mDataSaverBackend = new DataSaverBackend(getContext());
mAppSettings = findPreference(KEY_APP_SETTINGS);
diff --git a/src/com/android/settings/notification/ImportanceSeekBarPreference.java b/src/com/android/settings/notification/ImportanceSeekBarPreference.java
index 4da5dbf..b21f9ce 100644
--- a/src/com/android/settings/notification/ImportanceSeekBarPreference.java
+++ b/src/com/android/settings/notification/ImportanceSeekBarPreference.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.service.notification.NotificationListenerService;
@@ -45,6 +46,8 @@
private SeekBar mSeekBar;
private ColorStateList mActiveSliderTint;
private ColorStateList mInactiveSliderTint;
+ private float mActiveSliderAlpha = 1.0f;
+ private float mInactiveSliderAlpha;
private boolean mAutoOn;
private Handler mHandler;
@@ -57,6 +60,11 @@
mInactiveSliderTint = ColorStateList.valueOf(
context.getColor(R.color.importance_disabled_slider_color));
mHandler = new Handler();
+ final TypedArray ta =
+ context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.Theme, 0, 0);
+ mInactiveSliderAlpha =
+ ta.getFloat(com.android.internal.R.styleable.Theme_disabledAlpha, 0.5f);
+ ta.recycle();
}
public ImportanceSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -124,13 +132,12 @@
private void applyAutoUi(ImageView autoButton) {
mSeekBar.setEnabled(!mAutoOn);
- final ColorStateList sliderTint = mAutoOn ? mInactiveSliderTint : mActiveSliderTint;
+ final float alpha = mAutoOn ? mInactiveSliderAlpha : mActiveSliderAlpha;
final ColorStateList starTint = mAutoOn ? mActiveSliderTint : mInactiveSliderTint;
Drawable icon = autoButton.getDrawable().mutate();
icon.setTintList(starTint);
autoButton.setImageDrawable(icon);
- mSeekBar.setProgressTintList(sliderTint);
- mSeekBar.setThumbTintList(sliderTint);
+ mSeekBar.setAlpha(alpha);
if (mAutoOn) {
setProgress(NotificationListenerService.Ranking.IMPORTANCE_DEFAULT);