diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c71a6fbf40d..6acb6cd0a63 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1825,7 +1825,7 @@ diff --git a/res/drawable/ic_expand.xml b/res/drawable/ic_expand.xml index 72da2b9e34c..f5b3f66981e 100644 --- a/res/drawable/ic_expand.xml +++ b/res/drawable/ic_expand.xml @@ -19,6 +19,6 @@ - + diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml deleted file mode 100644 index edffde399a0..00000000000 --- a/res/drawable/ic_expand_more.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml index b55db22f340..3fae593bbf6 100644 --- a/res/layout/crypt_keeper_switch_input_method.xml +++ b/res/layout/crypt_keeper_switch_input_method.xml @@ -22,7 +22,7 @@ android:id="@+id/switch_ime_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_lockscreen_ime" + android:src="@*android:drawable/ic_lockscreen_ime" android:clickable="true" android:contentDescription="@string/crypt_keeper_switch_input_method" android:padding="@dimen/crypt_keeper_edit_text_ime_padding" diff --git a/res/layout/homepage_condition_header.xml b/res/layout/homepage_condition_header.xml index 8f3a92ca501..a2796ec1c82 100644 --- a/res/layout/homepage_condition_header.xml +++ b/res/layout/homepage_condition_header.xml @@ -45,8 +45,8 @@ android:paddingTop="@dimen/homepage_condition_header_indicator_padding_top" android:paddingStart="@dimen/homepage_condition_header_indicator_padding_start" android:paddingEnd="@dimen/homepage_condition_header_indicator_padding_end" - android:src="@drawable/ic_expand_more"/> + android:src="@*android:drawable/ic_expand_more"/> - \ No newline at end of file + diff --git a/res/values/styles.xml b/res/values/styles.xml index 2acdb215e9b..718a712b53e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -298,7 +298,7 @@ sans-serif-medium 14sp ?android:attr/colorAccent - @drawable/btn_borderless_rect + @*android:drawable/btn_borderless_rect center true 8dp diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index b5d2a999e4b..28e9fdcfa27 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -24,7 +24,7 @@ android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment" android:key="bluetooth_settings" android:title="@string/bluetooth_settings_title" - android:icon="@drawable/ic_settings_bluetooth" + android:icon="@*android:drawable/ic_settings_bluetooth" android:order="-9" settings:searchable="false"/> @@ -48,7 +48,7 @@ android:key="connected_device_printing" android:title="@string/print_settings" android:summary="@string/summary_placeholder" - android:icon="@drawable/ic_settings_print" + android:icon="@*android:drawable/ic_settings_print" android:fragment="com.android.settings.print.PrintSettingsFragment" android:order="-3" settings:searchable="false"/> diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 6ff4309a4fa..7cff772c96b 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -137,7 +137,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { MenuItem item = menu.add(0, EDIT_DEVICE_NAME_ITEM_ID, 0, R.string.bluetooth_rename_button); - item.setIcon(R.drawable.ic_mode_edit); + item.setIcon(com.android.internal.R.drawable.ic_mode_edit); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); super.onCreateOptionsMenu(menu, inflater); } diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 59b8007b68e..18df872a28a 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -73,7 +73,7 @@ public class BluetoothSliceBuilder { final boolean isBluetoothEnabled = isBluetoothEnabled(); final CharSequence title = context.getText(R.string.bluetooth_settings); final IconCompat icon = IconCompat.createWithResource(context, - R.drawable.ic_settings_bluetooth); + com.android.internal.R.drawable.ic_settings_bluetooth); @ColorInt final int color = com.android.settings.Utils.getColorAccent( context).getDefaultColor(); final PendingIntent toggleAction = getBroadcastIntent(context); diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java index a93d5223156..c91cc8ffd2c 100644 --- a/src/com/android/settings/fuelgauge/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/BatteryEntry.java @@ -157,7 +157,7 @@ public class BatteryEntry { break; case BLUETOOTH: name = context.getResources().getString(R.string.power_bluetooth); - iconId = R.drawable.ic_settings_bluetooth; + iconId = com.android.internal.R.drawable.ic_settings_bluetooth; break; case SCREEN: name = context.getResources().getString(R.string.power_screen); diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java index 03868ee67e3..ea2a30865ea 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java @@ -103,7 +103,7 @@ public class BluetoothDevicesSlice implements CustomSliceable { @Override public Slice getSlice() { final IconCompat icon = IconCompat.createWithResource(mContext, - R.drawable.ic_settings_bluetooth); + com.android.internal.R.drawable.ic_settings_bluetooth); final CharSequence title = mContext.getText(R.string.bluetooth_devices); final CharSequence titleNoBluetoothDevices = mContext.getText( R.string.no_bluetooth_devices); @@ -236,7 +236,8 @@ public class BluetoothDevicesSlice implements CustomSliceable { if (pair.first != null) { return IconCompat.createWithBitmap(getBitmapFromVectorDrawable(pair.first)); } else { - return IconCompat.createWithResource(mContext, R.drawable.ic_settings_bluetooth); + return IconCompat.createWithResource(mContext, + com.android.internal.R.drawable.ic_settings_bluetooth); } } @@ -303,4 +304,4 @@ public class BluetoothDevicesSlice implements CustomSliceable { return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java index e2078e3a13b..275969046ad 100644 --- a/src/com/android/settings/location/LocationSlice.java +++ b/src/com/android/settings/location/LocationSlice.java @@ -55,7 +55,7 @@ public class LocationSlice implements CustomSliceable { @Override public Slice getSlice() { final IconCompat icon = IconCompat.createWithResource(mContext, - R.drawable.ic_signal_location); + com.android.internal.R.drawable.ic_signal_location); final CharSequence title = mContext.getText(R.string.location_settings_title); @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext); final PendingIntent primaryAction = getPrimaryAction(); diff --git a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java index a773908607e..a014ec90683 100644 --- a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java @@ -62,7 +62,7 @@ public class ZenRuleButtonsPreferenceController extends AbstractZenModePreferenc if (isAvailable()) { mButtonsPref = ((ActionButtonsPreference) screen.findPreference(KEY)) .setButton1Text(R.string.zen_mode_rule_name_edit) - .setButton1Icon(R.drawable.ic_mode_edit) + .setButton1Icon(com.android.internal.R.drawable.ic_mode_edit) .setButton1OnClickListener(new EditRuleNameClickListener()) .setButton2Text(R.string.zen_mode_delete_rule_button) .setButton2Icon(R.drawable.ic_settings_delete) diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index c1101079223..271485983d5 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -344,7 +344,7 @@ public class EntityHeaderController { if (mEditOnClickListener == null) { button.setVisibility(View.GONE); } else { - button.setImageResource(R.drawable.ic_mode_edit); + button.setImageResource(com.android.internal.R.drawable.ic_mode_edit); button.setVisibility(View.VISIBLE); button.setOnClickListener(mEditOnClickListener); } diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java index 5ac0d284b46..ec43b0ffb24 100644 --- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java +++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java @@ -101,7 +101,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment { @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify); - item.setIcon(R.drawable.ic_mode_edit); + item.setIcon(com.android.internal.R.drawable.ic_mode_edit); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); super.onCreateOptionsMenu(menu, inflater); } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 9e5b617634f..f6969ec8aef 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -171,7 +171,8 @@ public class BluetoothDevicePreferenceTest { .thenReturn(new BluetoothClass(BluetoothClass.Device.Major.IMAGING)); mPreference.onDeviceAttributesChanged(); - DrawableTestHelper.assertDrawableResId(mPreference.getIcon(), R.drawable.ic_settings_print); + DrawableTestHelper.assertDrawableResId(mPreference.getIcon(), + com.android.internal.R.drawable.ic_settings_print); } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 4504d84fce0..f4a9d362d49 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -68,7 +68,7 @@ public class BluetoothSliceBuilderTest { final SliceAction primaryAction = metadata.getPrimaryAction(); final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext, - R.drawable.ic_settings_bluetooth); + com.android.internal.R.drawable.ic_settings_bluetooth); assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString()); } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java index bc34fd54f8b..02d7a9da679 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java @@ -83,7 +83,8 @@ public class BluetoothDevicesSliceTest { mBluetoothDevicesSlice = spy(new BluetoothDevicesSlice(mContext)); // Mock the icon and detail intent of Bluetooth. - mIcon = IconCompat.createWithResource(mContext, R.drawable.ic_settings_bluetooth); + mIcon = IconCompat.createWithResource(mContext, + com.android.internal.R.drawable.ic_settings_bluetooth); mDetailIntent = PendingIntent.getActivity(mContext, 0, new Intent("test action"), 0); doReturn(mIcon).when(mBluetoothDevicesSlice).getBluetoothDeviceIcon(any()); doReturn(mDetailIntent).when(mBluetoothDevicesSlice).getBluetoothDetailIntent(any()); @@ -208,4 +209,4 @@ public class BluetoothDevicesSliceTest { final CharSequence sliceTitle = metadata.getTitle(); return TextUtils.equals(sliceTitle, title); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java index 0618cd9bb93..a373b1f8a4e 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java @@ -47,7 +47,7 @@ public class LocationSliceTest { final SliceAction primaryAction = metadata.getPrimaryAction(); final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext, - R.drawable.ic_signal_location); + com.android.internal.R.drawable.ic_signal_location); assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString()); } }