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 am: 1c3d7aa1f9

Browse Source 
am: 4f0d017808

Change-Id: I0d52c9cce9724e64621f919215402639f2323a9e
This commit is contained in:
Amin Shaikh
2019-05-03 23:22:01 -07:00
committed by android-build-merger
parent 5ab07ffbc3 4f0d017808
commit 24b41f52d3
20 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/res/values/overlayable_icons_test.xml
View File

@@ -24,6 +24,7 @@
<item>@drawable/ic_android</item>
<item>@drawable/ic_apps</item>
<item>@drawable/ic_arrow_back</item>
<item>@drawable/ic_arrow_down_24dp</item>
<item>@drawable/ic_battery_charging_full</item>
<item>@drawable/ic_battery_saver_accent_24dp</item>
<item>@drawable/ic_battery_status_bad_24dp</item>
@@ -33,6 +34,7 @@
<item>@drawable/ic_cancel</item>
<item>@drawable/ic_cast_24dp</item>
<item>@drawable/ic_cellular_off</item>
<item>@drawable/ic_chevron_right_24dp</item>
<item>@drawable/ic_content_copy_grey600_24dp</item>
<item>@drawable/ic_data_saver</item>
<item>@drawable/ic_delete</item>
@@ -48,10 +50,11 @@
<item>@drawable/ic_gray_scale_24dp</item>
<item>@drawable/ic_headset_24dp</item>
<item>@drawable/ic_help</item>
<item>@drawable/ic_help_actionbar</item>
<item>@drawable/ic_homepage_search</item>
<item>@drawable/ic_info_outline_24</item>
<item>@drawable/ic_local_movies</item>
<item>@drawable/ic_local_phone_24_lib</item>
<item>@drawable/ic_lock</item>
<item>@drawable/ic_media_stream</item>
<item>@drawable/ic_media_stream_off</item>
<item>@drawable/ic_network_cell</item>
@@ -59,8 +62,11 @@
<item>@drawable/ic_notifications_off_24dp</item>
<item>@drawable/ic_phone_info</item>
<item>@drawable/ic_photo_library</item>
<item>@drawable/ic_search_24dp</item>
<item>@drawable/ic_settings_accent</item>
<item>@drawable/ic_settings_accessibility</item>
<item>@drawable/ic_settings_accounts</item>
<item>@drawable/ic_settings_backup</item>
<item>@drawable/ic_settings_battery_white</item>
<item>@drawable/ic_settings_data_usage</item>
<item>@drawable/ic_settings_date_time</item>
@@ -77,12 +83,14 @@
<item>@drawable/ic_settings_system_dashboard_white</item>
<item>@drawable/ic_settings_wireless</item>
<item>@drawable/ic_settings_wireless_white</item>
<item>@drawable/ic_storage</item>
<item>@drawable/ic_storage_white</item>
<item>@drawable/ic_suggestion_night_display</item>
<item>@drawable/ic_sync</item>
<item>@drawable/ic_system_update</item>
<item>@drawable/ic_videogame_vd_theme_24</item>
<item>@drawable/ic_volume_ringer_vibrate</item>
<item>@drawable/ic_volume_up_24dp</item>
<item>@drawable/ic_vpn_key</item>
<item>@drawable/ic_wifi_tethering</item>
</array>
</resources>

2
tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
View File

@@ -73,7 +73,7 @@ public class BluetoothPairingPreferenceControllerTest {
Preference pref = mController.createBluetoothPairingPreference(ORDER);
assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
DrawableTestHelper.assertDrawableResId(pref.getIcon(), R.drawable.ic_menu_add);
DrawableTestHelper.assertDrawableResId(pref.getIcon(), R.drawable.ic_add_24dp);
assertThat(pref.getOrder()).isEqualTo(ORDER);
assertThat(pref.getTitle())
.isEqualTo(mContext.getString(R.string.bluetooth_pairing_pref_title));