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

Merge "Fix themed settings icons." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-03 21:04:36 +00:00
committed by Android (Google) Code Review
parent 6aab54e4be 3f1de20c7e
commit 1c3d7aa1f9
20 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,7 +351,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
RestrictedPreference preference =
new RestrictedPreference(mParent.getPreferenceManager().getContext());
preference.setTitle(R.string.add_account_label);
preference.setIcon(R.drawable.ic_menu_add);
preference.setIcon(R.drawable.ic_add_24dp);
preference.setOnPreferenceClickListener(this);
preference.setOrder(ORDER_NEXT_TO_NEXT_TO_LAST);
return preference;

2
src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
View File

@@ -178,7 +178,7 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
return true;
});
preference.setTitle(R.string.print_menu_item_add_service);
preference.setIcon(R.drawable.ic_menu_add);
preference.setIcon(R.drawable.ic_add_24dp);
preference.setOrder(Integer.MAX_VALUE -1);
preference.setPersistent(false);
return preference;

2
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -396,7 +396,7 @@ public class FingerprintSettings extends SubSettings {
Preference addPreference = new Preference(root.getContext());
addPreference.setKey(KEY_FINGERPRINT_ADD);
addPreference.setTitle(R.string.fingerprint_add_title);
addPreference.setIcon(R.drawable.ic_menu_add);
addPreference.setIcon(R.drawable.ic_add_24dp);
root.addPreference(addPreference);
addPreference.setOnPreferenceChangeListener(this);
updateAddPreference();

2
src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
View File

@@ -76,7 +76,7 @@ public class BluetoothPairingPreferenceController extends AbstractPreferenceCont
public Preference createBluetoothPairingPreference(int order) {
mPreference = new Preference(mFragment.getPreferenceScreen().getContext());
mPreference.setKey(KEY_PAIRING);
mPreference.setIcon(R.drawable.ic_menu_add);
mPreference.setIcon(R.drawable.ic_add_24dp);
mPreference.setOrder(order);
mPreference.setTitle(R.string.bluetooth_pairing_pref_title);

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

@@ -154,7 +154,7 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab
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);
.setIcon(R.drawable.ic_add_24dp);
actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
MenuItem.SHOW_AS_ACTION_WITH_TEXT);
}

2
src/com/android/settings/network/ApnSettings.java
View File

@@ -351,7 +351,7 @@ public class ApnSettings extends RestrictedSettingsFragment
if (mAllowAddingApns) {
menu.add(0, MENU_NEW, 0,
getResources().getString(R.string.menu_new))
.setIcon(R.drawable.ic_menu_add)
.setIcon(R.drawable.ic_add_24dp)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
menu.add(0, MENU_RESTORE, 0,

2
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -242,7 +242,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
}
Preference preference = new Preference(getPrefContext());
preference.setTitle(R.string.print_menu_item_add_service);
preference.setIcon(R.drawable.ic_menu_add);
preference.setIcon(R.drawable.ic_add_24dp);
preference.setOrder(ORDER_LAST);
preference.setIntent(addNewServiceIntent);
preference.setPersistent(false);

2
src/com/android/settings/wifi/AddWifiNetworkPreference.java
View File

@@ -43,7 +43,7 @@ public class AddWifiNetworkPreference extends Preference {
setLayoutResource(com.android.settingslib.R.layout.preference_access_point);
setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
setIcon(R.drawable.ic_menu_add);
setIcon(R.drawable.ic_add_24dp);
setTitle(R.string.wifi_add_network);
mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);

2
src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
View File

@@ -148,7 +148,7 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
mFakeNetworkPreference.setTitle("fake network");
mAddPreference = new Preference(getPrefContext());
mAddPreference.setIcon(R.drawable.ic_menu_add);
mAddPreference.setIcon(R.drawable.ic_add_24dp);
mAddPreference.setTitle(R.string.wifi_add_network);
mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());