PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "More theming fixes." into nyc-mr1-dev am: 9341ac980e

Browse Source 
am: 4a8586cfe6

* commit '4a8586cfe6fa8ab72868fb55640c8e42b8c2d0fe':
  More theming fixes.

Change-Id: I245852591812d5beaaab15011e0ad4301ffe2947
This commit is contained in:
Andrew Sapperstein
2016-05-25 20:00:06 +00:00
committed by android-build-merger
parent e318e0ff47 4a8586cfe6
commit a2f67f1fbe
35 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/UserDictionarySettings.java
View File

@@ -160,7 +160,7 @@ public class UserDictionarySettings extends ListFragment {
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
MenuItem actionItem =
menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
.setIcon(R.drawable.ic_menu_add_dark);
.setIcon(R.drawable.ic_menu_add_white);
actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
MenuItem.SHOW_AS_ACTION_WITH_TEXT);
}

2
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -350,7 +350,7 @@ public class AccountSettings extends SettingsPreferenceFragment
private Preference newManagedProfileSettings() {
Preference preference = new Preference(getPrefContext());
preference.setTitle(R.string.managed_profile_settings_title);
preference.setIcon(R.drawable.ic_sysbar_quicksettings);
preference.setIcon(R.drawable.ic_settings);
preference.setOnPreferenceClickListener(this);
preference.setOrder(ORDER_NEXT_TO_LAST);
return preference;

8
src/com/android/settings/notification/ImportanceSeekBarPreference.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.notification;
import android.content.res.Resources;
import android.util.TypedValue;
import com.android.settings.R;
import com.android.settings.SeekBarPreference;
@@ -52,8 +54,10 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
setLayoutResource(R.layout.preference_importance_slider);
mActiveSliderTint = ColorStateList.valueOf(
context.getColor(R.color.importance_slider_color));
Resources.Theme theme = context.getTheme();
TypedValue typedValue = new TypedValue();
theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true);
mActiveSliderTint = ColorStateList.valueOf(context.getColor(typedValue.resourceId));
mInactiveSliderTint = ColorStateList.valueOf(
context.getColor(R.color.importance_disabled_slider_color));
mHandler = new Handler();