Merge "Adding P20 icons" into rvc-d1-dev (bf776645) · Commits · e / os / android_frameworks_base

core/tests/coretests/res/values/overlayable_icons_test.xml

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<resources>
		<!-- overlayable_icons references all of the drawables in this package
		that are being overlayed by resource overlays. If you remove/rename
		any of these resources, you must also change the resource overlay icons.-->
		<array name="overlayable_icons">
		<item>@*android:drawable/ic_audio_alarm</item>
		<item>@*android:drawable/ic_audio_alarm_mute</item>
		<item>@*android:drawable/ic_battery_80_24dp</item>
		<item>@*android:drawable/ic_bluetooth_share_icon</item>
		<item>@*android:drawable/ic_bt_headphones_a2dp</item>
		<item>@*android:drawable/ic_bt_headset_hfp</item>
		<item>@*android:drawable/ic_bt_hearing_aid</item>
		<item>@*android:drawable/ic_bt_laptop</item>
		<item>@*android:drawable/ic_bt_misc_hid</item>
		<item>@*android:drawable/ic_bt_network_pan</item>
		<item>@*android:drawable/ic_bt_pointing_hid</item>
		<item>@*android:drawable/ic_corp_badge</item>
		<item>@*android:drawable/ic_expand_more</item>
		<item>@*android:drawable/ic_faster_emergency</item>
		<item>@*android:drawable/ic_file_copy</item>
		<item>@*android:drawable/ic_lock</item>
		<item>@*android:drawable/ic_lock_bugreport</item>
		<item>@*android:drawable/ic_lock_open</item>
		<item>@*android:drawable/ic_lock_power_off</item>
		<item>@*android:drawable/ic_lockscreen_ime</item>
		<item>@*android:drawable/ic_mode_edit</item>
		<item>@*android:drawable/ic_notifications_alerted</item>
		<item>@*android:drawable/ic_phone</item>
		<item>@*android:drawable/ic_qs_airplane</item>
		<item>@*android:drawable/ic_qs_auto_rotate</item>
		<item>@*android:drawable/ic_qs_battery_saver</item>
		<item>@*android:drawable/ic_qs_bluetooth</item>
		<item>@*android:drawable/ic_qs_dnd</item>
		<item>@*android:drawable/ic_qs_flashlight</item>
		<item>@*android:drawable/ic_qs_night_display_on</item>
		<item>@*android:drawable/ic_qs_ui_mode_night</item>
		<item>@*android:drawable/ic_restart</item>
		<item>@*android:drawable/ic_screenshot</item>
		<item>@*android:drawable/ic_settings_bluetooth</item>
		<item>@*android:drawable/ic_signal_cellular_0_4_bar</item>
		<item>@*android:drawable/ic_signal_cellular_0_5_bar</item>
		<item>@*android:drawable/ic_signal_cellular_1_4_bar</item>
		<item>@*android:drawable/ic_signal_cellular_1_5_bar</item>
		<item>@*android:drawable/ic_signal_cellular_2_4_bar</item>
		<item>@*android:drawable/ic_signal_cellular_2_5_bar</item>
		<item>@*android:drawable/ic_signal_cellular_3_4_bar</item>
		<item>@*android:drawable/ic_signal_cellular_3_5_bar</item>
		<item>@*android:drawable/ic_signal_cellular_4_4_bar</item>
		<item>@*android:drawable/ic_signal_cellular_4_5_bar</item>
		<item>@*android:drawable/ic_signal_cellular_5_5_bar</item>
		<item>@*android:drawable/ic_signal_location</item>
		<item>@*android:drawable/ic_wifi_signal_0</item>
		<item>@*android:drawable/ic_wifi_signal_1</item>
		<item>@*android:drawable/ic_wifi_signal_2</item>
		<item>@*android:drawable/ic_wifi_signal_3</item>
		<item>@*android:drawable/ic_wifi_signal_4</item>
		<item>@*android:drawable/perm_group_activity_recognition</item>
		<item>@*android:drawable/perm_group_aural</item>
		<item>@*android:drawable/perm_group_calendar</item>
		<item>@*android:drawable/perm_group_call_log</item>
		<item>@*android:drawable/perm_group_camera</item>
		<item>@*android:drawable/perm_group_contacts</item>
		<item>@*android:drawable/perm_group_location</item>
		<item>@*android:drawable/perm_group_microphone</item>
		<item>@*android:drawable/perm_group_phone_calls</item>
		<item>@*android:drawable/perm_group_sensors</item>
		<item>@*android:drawable/perm_group_sms</item>
		<item>@*android:drawable/perm_group_storage</item>
		<item>@*android:drawable/perm_group_visual</item>
		</array>
		</resources>

packages/overlays/Android.mk

+15 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,21 @@ LOCAL_REQUIRED_MODULES := \
		IconPackCircularSettingsOverlay \
		IconPackCircularSystemUIOverlay \
		IconPackCircularThemePickerOverlay \
		IconPackVictorAndroidOverlay \
		IconPackVictorLauncherOverlay \
		IconPackVictorSettingsOverlay \
		IconPackVictorSystemUIOverlay \
		IconPackVictorThemePickerOverlay \
		IconPackSamAndroidOverlay \
		IconPackSamLauncherOverlay \
		IconPackSamSettingsOverlay \
		IconPackSamSystemUIOverlay \
		IconPackSamThemePickerOverlay \
		IconPackKaiAndroidOverlay \
		IconPackKaiLauncherOverlay \
		IconPackKaiSettingsOverlay \
		IconPackKaiSystemUIOverlay \
		IconPackKaiThemePickerOverlay \
		IconPackFilledAndroidOverlay \
		IconPackFilledLauncherOverlay \
		IconPackFilledSettingsOverlay \

packages/overlays/FontKaiOverlay/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,13 +17,13 @@
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_RRO_THEME := FontLustria
		LOCAL_RRO_THEME := FontKai

		LOCAL_PRODUCT_MODULE := true

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

		LOCAL_PACKAGE_NAME := FontLustriaOverlay
		LOCAL_PACKAGE_NAME := FontKaiOverlay
		LOCAL_SDK_VERSION := current

		include $(BUILD_RRO_PACKAGE)

packages/overlays/IconPackCircularThemePickerOverlay/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,6 @@
		package="com.android.theme.icon_pack.circular.themepicker"
		android:versionCode="1"
		android:versionName="1.0">
		<overlay android:targetPackage="com.android.wallpaper" android:category="android.theme.customization.icon_pack.themepicker" android:priority="1"/>
		<overlay android:targetPackage="com.google.android.apps.wallpaper" android:category="android.theme.customization.icon_pack.themepicker" android:priority="1"/>
		<application android:label="Circular" android:hasCode="false"/>
		</manifest>

packages/overlays/IconPackFilledThemePickerOverlay/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,6 @@
		package="com.android.theme.icon_pack.filled.themepicker"
		android:versionCode="1"
		android:versionName="1.0">
		<overlay android:targetPackage="com.android.wallpaper" android:category="android.theme.customization.icon_pack.themepicker" android:priority="1"/>
		<overlay android:targetPackage="com.google.android.apps.wallpaper" android:category="android.theme.customization.icon_pack.themepicker" android:priority="1"/>
		<application android:label="Filled" android:hasCode="false"/>
		</manifest>