diff --git a/Android.mk b/Android.mk index cb856cec23c47a5d174425bfda0f85e1197c5d65..e37e9fbff1a6a56a498c17a64790ea379ea67f6f 100644 --- a/Android.mk +++ b/Android.mk @@ -21,13 +21,17 @@ LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-slices-builders \ + android-slices-core \ + android-slices-view \ + android-support-compat \ android-support-v4 \ android-support-v13 \ android-support-v7-appcompat \ android-support-v7-cardview \ android-support-v7-preference \ android-support-v7-recyclerview \ - android-support-v14-preference + android-support-v14-preference \ LOCAL_JAVA_LIBRARIES := \ bouncycastle \ @@ -35,8 +39,11 @@ LOCAL_JAVA_LIBRARIES := \ ims-common LOCAL_STATIC_JAVA_LIBRARIES := \ + android-arch-lifecycle-runtime \ + android-arch-lifecycle-extensions \ + guava \ jsr305 \ - settings-logtags + settings-logtags \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 07996ac06a66de55cc4faa7fe1c7f34e127e2adb..27132165b9123b2a26d00eb848234af661889631 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,12 +29,14 @@ + + @@ -72,6 +74,7 @@ + @@ -82,10 +85,15 @@ + + + + + + android:directBootAware="true" + android:appComponentFactory="android.support.v4.app.CoreComponentFactory"> + @@ -115,7 +125,7 @@ @@ -136,10 +146,9 @@ - + android:parentActivityName="Settings" /> - @@ -148,11 +157,12 @@ - + android:icon="@drawable/ic_homepage_network" + android:parentActivityName="Settings" + android:taskAffinity="com.android.settings"> @@ -174,19 +184,19 @@ android:value="true" /> - - - + + - @@ -210,20 +220,23 @@ - + + + + + - - - + @@ -240,21 +253,10 @@ android:value="true" /> - - - - - - + @@ -267,12 +269,13 @@ android:value="true" /> - + @@ -288,12 +291,13 @@ android:value="true" /> - + @@ -308,9 +312,7 @@ android:value="true" /> - + @@ -320,9 +322,7 @@ android:value="com.android.settings.wifi.WifiInfo" /> - + @@ -387,31 +387,37 @@ + android:value="com.android.settings.network.ApnSettings" /> - - - - - + + - - + - + android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" /> + + + + + + + android:icon="@drawable/ic_settings_gestures"> @@ -420,16 +426,6 @@ android:value="com.android.settings.gestures.AssistGestureSettings" /> - - - - - - @@ -455,10 +451,12 @@ - + @@ -480,8 +478,8 @@ + android:taskAffinity="com.android.settings" + android:parentActivityName="Settings"> @@ -491,11 +489,12 @@ android:value="com.android.settings.wifi.p2p.WifiP2pSettings" /> - - + @@ -513,10 +512,12 @@ android:value="true" /> - + @@ -538,11 +539,12 @@ android:value="true" /> - + @@ -558,11 +560,12 @@ android:value="true" /> - + android:parentActivityName="Settings"> @@ -591,10 +594,11 @@ android:value="true" /> - + @@ -643,10 +647,11 @@ android:value="com.android.settings.language.LanguageAndInputSettings" /> - + @@ -672,10 +677,11 @@ android:value="true" /> - + @@ -692,6 +698,7 @@ - - - - - - + - - - - - - + - - + + + @@ -742,36 +738,64 @@ android:value="true" /> - - - + + + + + + + + + + + + - + - + + + + + + + + + + + + android:value="com.android.settings.notification.ZenModeAutomationSettings" /> + android:value="true" /> + android:icon="@drawable/ic_wallpaper"> @@ -813,9 +837,11 @@ android:resource="@string/new_device_suggestion_summary" /> - + @@ -830,9 +856,11 @@ android:value="true" /> - + @@ -847,27 +875,12 @@ android:value="true" /> - - - - - - - - - - - - - - + @@ -901,11 +914,13 @@ android:value="com.android.settings.DisplaySettings" /> - + @@ -921,9 +936,9 @@ android:value="true" /> - @@ -941,11 +956,13 @@ android:value="com.android.settings.display.NightDisplaySettings" /> - + @@ -963,15 +980,45 @@ + android:value="com.android.settings.deviceinfo.DeviceInfoSettings" /> - + + + + + + + + + + + + + + + + + + + + + @@ -980,12 +1027,15 @@ android:value="true" /> - + + @@ -995,16 +1045,26 @@ + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - - + + + + + + + @@ -1014,19 +1074,11 @@ + android:icon="@drawable/ic_settings_memory"> - - - - - @@ -1042,35 +1094,24 @@ android:value="com.android.settings.applications.ProcessStatsUi" /> - - - - - - - - - - + + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - + @@ -1078,10 +1119,10 @@ - + @@ -1089,21 +1130,18 @@ - - - - - - - - + + + + + + + + @@ -1112,7 +1150,7 @@ android:exported="true" android:targetActivity="Settings$ManageApplicationsActivity"> + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - + android:exported="true" /> + + + + + + + + + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - + @@ -1180,15 +1227,16 @@ + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - + @@ -1208,40 +1256,24 @@ - - + android:value="com.android.settings.applications.appops.BackgroundCheckSummary" /> - + @@ -1257,13 +1289,30 @@ + + + + + + + + - + @@ -1280,7 +1329,7 @@ + android:value="com.android.settings.security.SecuritySettings" /> @@ -1300,10 +1349,12 @@ - + @@ -1315,16 +1366,6 @@ android:value="true" /> - - - - - - + android:label="@string/local_backup_password_title" + android:exported="false" /> - + @@ -1389,10 +1431,20 @@ - + + + + + + + + @@ -1402,18 +1454,9 @@ + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - - - - - - - @@ -1426,11 +1469,13 @@ android:value="com.android.settings.IccLockSettings" /> - + @@ -1477,10 +1522,11 @@ android:value="true" /> - + @@ -1495,10 +1541,11 @@ android:value="true" /> - + @@ -1513,10 +1560,11 @@ android:value="true" /> - + @@ -1527,10 +1575,11 @@ android:value="true" /> - + @@ -1539,8 +1588,6 @@ android:value="com.android.settings.enterprise.EnterprisePrivacySettings" /> - - - + + + + + + @@ -1687,14 +1741,12 @@ android:value="true" /> - - - @@ -1716,6 +1768,7 @@ android:resource="@string/suggested_fingerprint_lock_settings_title" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1818,18 +1833,18 @@ android:value="true" /> - + + android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" /> - + @@ -1842,47 +1857,50 @@ android:value="com.android.settings.deviceinfo.PublicVolumeSettings" /> - + - - @@ -1908,30 +1926,32 @@ + android:value="com.android.settings.network.ApnEditor" /> - + - + + android:value="com.android.settings.category.ia.system" /> + android:resource="@string/summary_empty"/> + android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" /> + android:value="true" /> - - - - - - - - - - - - + android:label="@string/select_webview_provider_dialog_title" /> - + + + + - + @@ -2125,10 +2129,12 @@ android:value="true" /> - + @@ -2146,17 +2152,9 @@ android:value="com.android.settings.wfd.WifiDisplaySettings" /> - - - - - - - - @@ -2212,7 +2210,8 @@ - @@ -2221,10 +2220,12 @@ - + @@ -2243,25 +2244,18 @@ android:value="com.android.settings.fuelgauge.PowerUsageSummary" /> - - - - - - + + android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" /> @@ -2277,9 +2271,10 @@ - @@ -2294,9 +2289,10 @@ - @@ -2307,12 +2303,13 @@ android:value="com.android.settings.accounts.ManagedProfileSettings" /> - + android:parentActivityName="Settings"> @@ -2386,31 +2383,40 @@ + android:value="com.android.settings.security.CryptKeeperSettings" /> - - - + + + + - + android:value="com.android.settings.category.ia.wireless" /> + android:value="com.android.settings.datausage.DataUsageSummary" /> - + + + + + @@ -2420,14 +2426,16 @@ + android:value="com.android.settings.category.ia.wireless" /> + android:value="com.android.settings.datausage.DataUsageSummaryLegacy" /> - + @@ -2436,10 +2444,12 @@ android:value="com.android.settings.datausage.DataUsageList" /> - + @@ -2455,10 +2465,12 @@ android:value="true" /> - + @@ -2467,21 +2479,23 @@ - + + android:value="com.android.settings.category.ia.system" /> - + @@ -2510,7 +2524,7 @@ + android:parentActivityName="Settings$PaymentSettingsActivity" android:excludeFromRecents="true"> @@ -2524,19 +2538,11 @@ - - - - - - - - - + @@ -2549,9 +2555,11 @@ android:value="com.android.settings.notification.NotificationAccessSettings" /> - + @@ -2564,9 +2572,11 @@ android:value="com.android.settings.applications.VrListenerSettings" /> - + android:taskAffinity="com.android.settings" + android:parentActivityName="Settings"> @@ -2576,24 +2586,28 @@ + android:value="com.android.settings.applications.appinfo.PictureInPictureSettings" /> - + android:taskAffinity="com.android.settings" + android:parentActivityName="Settings"> + android:value="com.android.settings.applications.appinfo.PictureInPictureDetails" /> - + @@ -2606,10 +2620,12 @@ android:value="com.android.settings.notification.ZenAccessSettings" /> - + @@ -2624,6 +2640,8 @@ + - + @@ -2661,28 +2681,21 @@ android:resource="@string/sound_dashboard_summary"/> - - - - - + android:label="@string/app_notifications_title" + android:icon="@drawable/ic_notifications" + android:exported="true" + android:taskAffinity=""> + + + + - + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> @@ -2700,8 +2713,20 @@ android:value="com.android.settings.notification.AppNotificationSettings" /> + + + + + + + + + @@ -2716,10 +2741,12 @@ - + @@ -2729,10 +2756,12 @@ - + @@ -2791,10 +2820,12 @@ android:resource="@xml/file_paths" /> - + @@ -2816,11 +2847,11 @@ - + android:excludeFromRecents="true" /> - @@ -2830,7 +2861,8 @@ - - + @@ -2862,21 +2896,20 @@ + android:value="com.android.settings.wifi.calling.WifiCallingSettings" /> - + android:icon="@drawable/ic_settings_wireless"> + android:value="com.android.settings.wifi.calling.WifiCallingSettings" /> - + + + + + + + + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - + + android:value="com.android.settings.applications.appinfo.DrawOverlayDetails" /> - + + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - - + + android:value="com.android.settings.applications.appinfo.WriteSettingsDetails" /> - + + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> + android:value="com.android.settings.applications.appinfo.ExternalSourcesDetails" /> - - + - + @@ -3030,19 +3083,18 @@ - - - - + @@ -3051,18 +3103,12 @@ android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" /> - - - - - - - - + @@ -3074,9 +3120,12 @@ android:resource="@string/app_and_notification_dashboard_summary"/> - + @@ -3085,16 +3134,19 @@ + android:value="com.android.settings.accounts.AccountDashboardFragment"/> + android:value="true" /> - + @@ -3108,7 +3160,7 @@ @@ -3124,16 +3176,17 @@ android:resource="@string/support_summary"/> - - + + - + + + + + + + - - - - - + + + + + - - - - - - - - + + + + - - - + android:value="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" /> + - + - - + + - - - + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> - + - - + + + + + - - - - - + - + - - + - - - - - - + - - + + - - - - - + + + + - + + + + + + + diff --git a/OWNERS b/OWNERS index 244516ed96e9ba7f15eabff47e78c62a9f585fb1..d2bc1ff485734bdc6df31b4e0c7551b652ef0f50 100644 --- a/OWNERS +++ b/OWNERS @@ -1,3 +1,7 @@ +# Use this reviewer by default. +pixel-sw-exp-reviews+gerrit@google.com + +# People who can approve changes for submission asapperstein@google.com asargent@google.com dehboxturtle@google.com @@ -9,3 +13,6 @@ zhfan@google.com # Emergency approvers in case the above are not available miket@google.com + +# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS) +per-file *.xml=* \ No newline at end of file diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index bbc1f689c713f7bd9d30c360ae4fd34c17f9cda8..8e1ab2bf76e8d8f16afe71700ee7f503b641747d 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,4 +1,5 @@ [Hook Scripts] -checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} - -fw src/com/android/settings/print/ +checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p . + +strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT} diff --git a/color-check-baseline.xml b/color-check-baseline.xml new file mode 100644 index 0000000000000000000000000000000000000000..7ce4da7f9d4335f4043ce83041c9a87158846866 --- /dev/null +++ b/color-check-baseline.xml @@ -0,0 +1,2948 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proguard.flags b/proguard.flags index d644f47887cdf3dd63afdd496395c58b747a8791..43a038b78a7fff88af0c8a9a8eed2771472b01d0 100644 --- a/proguard.flags +++ b/proguard.flags @@ -4,6 +4,15 @@ # Keep all Fragments in this package, which are used by reflection. -keep public class com.android.settings.** extends android.app.Fragment +# Keep all preference controllers needed by slice and DashboardFragment. +-keep class * extends com.android.settings.core.BasePreferenceController { + *; +} + +-keep class * extends com.android.settings.core.TogglePreferenceController { + *; +} + # We want to keep methods in Activity that could be used in the XML attribute onClick. -keepclassmembers class * extends android.app.Activity { public void *(android.view.View); @@ -27,6 +36,9 @@ -keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet, int); } +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet, int, int); +} # Keep annotated classes or class members. -keep @android.support.annotation.Keep class * @@ -39,3 +51,4 @@ public static ** SEARCH_INDEX_DATA_PROVIDER; public static ** SUMMARY_PROVIDER_FACTORY; } +-keep class android.support.v4.app.CoreComponentFactory diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..aed30c027aa48021902da039f599dc93a9029355 --- /dev/null +++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..b24e1ddead8a1e74e5fd6ae36a7b7500aa6d07f9 --- /dev/null +++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/res/anim/enrollment_fingerprint_background_5_path_animation.xml b/res/anim/enrollment_fingerprint_background_5_path_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..aed30c027aa48021902da039f599dc93a9029355 --- /dev/null +++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/res/anim/enrollment_fingerprint_background_6_path_animation.xml b/res/anim/enrollment_fingerprint_background_6_path_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..5748f7755decc4f15317a64209706f2637486967 --- /dev/null +++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/res/anim/enrollment_fingerprint_background_7_path_animation.xml b/res/anim/enrollment_fingerprint_background_7_path_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..c458d32470d6b7ecf3c78834e8319549050c6793 --- /dev/null +++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/res/color/battery_icon_color_error.xml b/res/color/battery_icon_color_error.xml index 3a71aaef8913b2e59d621a092a55b371bb2fc0b6..99c7d7d9dac435b06fb9c347bdaa7b5a34fec70f 100644 --- a/res/color/battery_icon_color_error.xml +++ b/res/color/battery_icon_color_error.xml @@ -14,6 +14,6 @@ limitations under the License. --> - \ No newline at end of file diff --git a/res/color/fingerprint_indicator_background_activated.xml b/res/color/fingerprint_indicator_background_activated.xml deleted file mode 100644 index 32f5383676bbcba55a9157a9006d1a04e4fdb3e7..0000000000000000000000000000000000000000 --- a/res/color/fingerprint_indicator_background_activated.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/res/color/preference_highligh_color.xml b/res/color/preference_highligh_color.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8d54d470e781d9efa35b466c7705b19f7244869 --- /dev/null +++ b/res/color/preference_highligh_color.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/res/color/switchbar_switch_thumb_tint.xml b/res/color/switchbar_switch_thumb_tint.xml new file mode 100644 index 0000000000000000000000000000000000000000..4c75a7e4cc76005ff1bc4f22b6da6ba8a51d76b7 --- /dev/null +++ b/res/color/switchbar_switch_thumb_tint.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/res/color/switchbar_switch_track_tint.xml b/res/color/switchbar_switch_track_tint.xml new file mode 100644 index 0000000000000000000000000000000000000000..141f9775bbafd0acce0a099df779e437c3a09775 --- /dev/null +++ b/res/color/switchbar_switch_track_tint.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable-hdpi/empty_search_results.png b/res/drawable-hdpi/empty_search_results.png deleted file mode 100644 index 6202a330221cfe89ea98600e52183ac9d78f3290..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/empty_search_results.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png deleted file mode 100644 index 918b0cc48bc4ed3319775d9be6b338cbb44e3fcc..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_wps_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png deleted file mode 100644 index 5ad9f3eaeaf4dfc6e741cd5ecb1c4f7403c00ecc..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_wps_light.png and /dev/null differ diff --git a/res/drawable-mdpi/empty_search_results.png b/res/drawable-mdpi/empty_search_results.png deleted file mode 100644 index e418d7c56c35f6aba70c12f58f88a688a9ec6117..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/empty_search_results.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png deleted file mode 100644 index 77d73a808cda8d3169ead319c82868f595ff05e5..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_wps_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png deleted file mode 100644 index ef560fa5c3958e45e4b57ad672fb3740c0451057..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_wps_light.png and /dev/null differ diff --git a/res/drawable-nodpi/aab_brightness b/res/drawable-nodpi/aab_brightness new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/res/drawable-nodpi/auto_awesome_battery b/res/drawable-nodpi/auto_awesome_battery new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/res/drawable-nodpi/color_mode_preview.jpg b/res/drawable-nodpi/color_mode_preview.jpg new file mode 100644 index 0000000000000000000000000000000000000000..51dedbf48ade71b2fbdc039378e54796fe13f939 Binary files /dev/null and b/res/drawable-nodpi/color_mode_preview.jpg differ diff --git a/res/drawable-nodpi/fingerprint_enroll_introduction.png b/res/drawable-nodpi/fingerprint_enroll_introduction.png deleted file mode 100644 index 268ca43325988a5b324d5ed486e023db67b191aa..0000000000000000000000000000000000000000 Binary files a/res/drawable-nodpi/fingerprint_enroll_introduction.png and /dev/null differ diff --git a/res/drawable-nodpi/fp_app_indicator.png b/res/drawable-nodpi/fp_app_indicator.png deleted file mode 100644 index d4d6ea13ba46f44592a00227adda00cdc5ba01a5..0000000000000000000000000000000000000000 Binary files a/res/drawable-nodpi/fp_app_indicator.png and /dev/null differ diff --git a/res/drawable-nodpi/fp_enrollment_header.png b/res/drawable-nodpi/fp_enrollment_header.png deleted file mode 100644 index 4e7b93163094918da36a6cfdd6fffd8499972349..0000000000000000000000000000000000000000 Binary files a/res/drawable-nodpi/fp_enrollment_header.png and /dev/null differ diff --git a/res/drawable-nodpi/gesture_prevent_ringing b/res/drawable-nodpi/gesture_prevent_ringing new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/res/drawable-nodpi/gesture_swipe_up.png b/res/drawable-nodpi/gesture_swipe_up.png new file mode 100644 index 0000000000000000000000000000000000000000..a041f9bf19c6b2824d8a75d4a64f7f7542337237 Binary files /dev/null and b/res/drawable-nodpi/gesture_swipe_up.png differ diff --git a/res/drawable-xhdpi/empty_search_results.png b/res/drawable-xhdpi/empty_search_results.png deleted file mode 100644 index a92f000edc287f5ed4a2ae11de7156495c24f16f..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/empty_search_results.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png deleted file mode 100644 index 3ea4a3b6bcb8574c28cafd39445da0cfe116922f..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_wps_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png deleted file mode 100644 index f913d2c00eadb71903152589af636c7fc389e729..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_wps_light.png and /dev/null differ diff --git a/res/drawable-xxhdpi/empty_search_results.png b/res/drawable-xxhdpi/empty_search_results.png deleted file mode 100644 index 4c549bcaec2fcbbf6dfa8bcfe68b11b9f59d2948..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/empty_search_results.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png deleted file mode 100644 index 8b38db86f79148d4229ca4a8ffd1ae32b8bbd557..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_wps_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png deleted file mode 100644 index 00841755b7669b50bd6c0405a0f0f1b2b240b7dd..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_wps_light.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/empty_search_results.png b/res/drawable-xxxhdpi/empty_search_results.png deleted file mode 100644 index 1aed6ad18c35d522483b9c3058fd48e2426013fa..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/empty_search_results.png and /dev/null differ diff --git a/res/drawable/color_bar_progress.xml b/res/drawable/color_bar_progress.xml new file mode 100644 index 0000000000000000000000000000000000000000..d2774678636251360daaf3b0df80ac3e8b5e9f8d --- /dev/null +++ b/res/drawable/color_bar_progress.xml @@ -0,0 +1,45 @@ + + + + + + + + + + r + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/enrollment_fingerprint_isolated.xml b/res/drawable/enrollment_fingerprint_isolated.xml index de3965e1fde3bfabae84372cc9ed3097144e5ff2..26451de1c0dbf33bc9c4c7eec51c187bdfa8327e 100644 --- a/res/drawable/enrollment_fingerprint_isolated.xml +++ b/res/drawable/enrollment_fingerprint_isolated.xml @@ -30,7 +30,7 @@ @@ -40,7 +40,7 @@ @@ -50,7 +50,7 @@ @@ -60,7 +60,7 @@ @@ -72,7 +72,7 @@ diff --git a/res/drawable/fingerprint_enroll_finish.xml b/res/drawable/fingerprint_enroll_finish.xml new file mode 100644 index 0000000000000000000000000000000000000000..9bc72830620f1cc31ea073fb2f119dbd785242a4 --- /dev/null +++ b/res/drawable/fingerprint_enroll_finish.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/fingerprint_enroll_introduction.xml b/res/drawable/fingerprint_enroll_introduction.xml new file mode 100644 index 0000000000000000000000000000000000000000..2a5c62a59bd949808c4e042f398f791419772c85 --- /dev/null +++ b/res/drawable/fingerprint_enroll_introduction.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + diff --git a/res/drawable/fp_illustration.xml b/res/drawable/fp_illustration.xml index 17ab4d27cfc3ab9865a27780e3765e6f5ff01f38..8368d9b31663217083426cbe0905337dd84d216d 100644 --- a/res/drawable/fp_illustration.xml +++ b/res/drawable/fp_illustration.xml @@ -19,7 +19,7 @@ + android:drawable="@drawable/fp_illustration_enrollment_animation" /> diff --git a/res/drawable/fp_illustration_enrollment_animation.xml b/res/drawable/fp_illustration_enrollment_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..2e1bfd9ced4df08ba3fbf651364500953b25c458 --- /dev/null +++ b/res/drawable/fp_illustration_enrollment_animation.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml index 9f00141c4fef36fabab93d9e1313f3b6a47124e0..841c25a1e7b1aa1acf65d4de3e3e6fbaf36a5a25 100644 --- a/res/drawable/ic_apps.xml +++ b/res/drawable/ic_apps.xml @@ -17,8 +17,7 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + + diff --git a/res/drawable/ic_sms_mirroring_24dp.xml b/res/drawable/ic_attach_money_black_24dp.xml similarity index 65% rename from res/drawable/ic_sms_mirroring_24dp.xml rename to res/drawable/ic_attach_money_black_24dp.xml index 5fe30030214071d6cb5724304d87665b2b162490..12605fd9c666016a8700df16efde955b2b79fadb 100644 --- a/res/drawable/ic_sms_mirroring_24dp.xml +++ b/res/drawable/ic_attach_money_black_24dp.xml @@ -1,5 +1,5 @@ - + + + + diff --git a/res/drawable/ic_battery_saver_accent_24dp.xml b/res/drawable/ic_battery_saver_accent_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..c8def54883d3cc54b2dc0ba69b7e9b8467cb9e64 --- /dev/null +++ b/res/drawable/ic_battery_saver_accent_24dp.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/res/drawable/ic_battery_status_bad_24dp.xml b/res/drawable/ic_battery_status_bad_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..d841f08a218fa8cdbbb447de0ba506e7160b2bd9 --- /dev/null +++ b/res/drawable/ic_battery_status_bad_24dp.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_battery_status_good_24dp.xml b/res/drawable/ic_battery_status_good_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..4628ee588c9d8525dea45932b39dd10cec3117fa --- /dev/null +++ b/res/drawable/ic_battery_status_good_24dp.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_battery_status_maybe_24dp.xml b/res/drawable/ic_battery_status_maybe_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..64451be7304999a380f38613bc36d4987381d36d --- /dev/null +++ b/res/drawable/ic_battery_status_maybe_24dp.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml index b90c18c75216439a78d6d4580ebf9d24d24f3ee1..c84f18ede0595e45160523c91e5c0944e4cc383a 100644 --- a/res/drawable/ic_cancel.xml +++ b/res/drawable/ic_cancel.xml @@ -16,10 +16,12 @@ - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + android:pathData="M15.59,7l-3.59,3.59l-3.59,-3.59l-1.41,1.41l3.59,3.59l-3.59,3.59l1.41,1.41l3.59,-3.59l3.59,3.59l1.41,-1.41l-3.59,-3.59l3.59,-3.59z"/> diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml index 948decab7d71feb39dc6d06faca1ca2164bab104..e8245d96ce9b0d9f91e2e90781dc61cfdde06073 100644 --- a/res/drawable/ic_cast_24dp.xml +++ b/res/drawable/ic_cast_24dp.xml @@ -21,11 +21,6 @@ android:viewportHeight="24.0" android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FF000000" + android:pathData="M21,3H3C1.9,3 1,3.9 1,5v3h2V5h18v14h-7v2h7c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3zM1,18v3h3C4,19.34 2.66,18 1,18zM1,14v2c2.76,0 5,2.24 5,5h2C8,17.13 4.87,14 1,14zM1,10v2c4.97,0 9,4.03 9,9h2C12,14.92 7.07,10 1,10z"/> diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml index 7840123ef737689372f1bba41b63e1891b2542f3..4f767cfbb112848ffd4f60f708889775d19ecdc1 100644 --- a/res/drawable/ic_cellular_off.xml +++ b/res/drawable/ic_cellular_off.xml @@ -20,22 +20,9 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M22.32,16.05l-1.45,1.45l1.45,1.45c0.38,0.38 0.38,0.99 0,1.37c-0.38,0.38 -0.99,0.38 -1.37,0l-1.44,-1.44l-1.45,1.45c-0.38,0.38 -0.99,0.38 -1.37,0l-0.01,-0.01c-0.38,-0.38 -0.38,-0.99 0,-1.37c0,0 0,0 0,0l1.45,-1.45l-1.45,-1.45c-0.38,-0.38 -0.38,-0.99 0,-1.37c0,0 0,0 0,0l0.01,-0.01c0.38,-0.38 0.99,-0.38 1.37,0l1.45,1.45l1.44,-1.44c0.38,-0.38 0.99,-0.38 1.37,0C22.7,15.06 22.7,15.67 22.32,16.05z"/> + android:fillColor="#FF000000" + android:pathData="M22,12V3.8c0,-0.71 -0.87,-1.08 -1.38,-0.57L3.24,20.62C2.73,21.13 3.09,22 3.8,22H14V12H22z"/> diff --git a/res/drawable/ic_check_circle_green_24dp.xml b/res/drawable/ic_check_circle_green_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f2692ddbbc969f4c24846b33e9e7174e2d7b09d --- /dev/null +++ b/res/drawable/ic_check_circle_green_24dp.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml index ba621874ebb90f4d015512c3034bd8b8f3ff6807..17e2b92a2d8c1280973f9e336edd87207e49369f 100644 --- a/res/drawable/ic_chevron_right_24dp.xml +++ b/res/drawable/ic_chevron_right_24dp.xml @@ -23,6 +23,5 @@ android:viewportWidth="24.0" android:tint="?android:attr/colorControlNormal"> + android:pathData="M9.71,18.71l-1.42,-1.42l5.3,-5.29l-5.3,-5.29l1.42,-1.42l6.7,6.71z"/> diff --git a/res/drawable/ic_color_inversion.xml b/res/drawable/ic_color_inversion.xml new file mode 100644 index 0000000000000000000000000000000000000000..aa59f5a0c4d737c90277d4a97b003595f5b20656 --- /dev/null +++ b/res/drawable/ic_color_inversion.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_daltonizer.xml b/res/drawable/ic_daltonizer.xml new file mode 100644 index 0000000000000000000000000000000000000000..04e397d52a4a863d2685a5c691c0b64ab8f493b4 --- /dev/null +++ b/res/drawable/ic_daltonizer.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml index d4f79e3233bfb686ebedb04ccff6c18afac87808..d1290c50a0284d7126c9d32af0a78a695808b972 100644 --- a/res/drawable/ic_delete.xml +++ b/res/drawable/ic_delete.xml @@ -16,10 +16,16 @@ Copyright (C) 2015 The Android Open Source Project + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FF000000" + android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/> + + diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index b22e48356e6bd987b77731618da22d8d3bd5a79a..b40acebef838faac8ba9e4ab78e82337ab560199 100644 --- a/res/drawable/ic_devices_other.xml +++ b/res/drawable/ic_devices_other.xml @@ -17,8 +17,7 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + + + + \ No newline at end of file diff --git a/res/drawable/ic_settings_notifications.xml b/res/drawable/ic_do_not_disturb_on_24dp.xml similarity index 66% rename from res/drawable/ic_settings_notifications.xml rename to res/drawable/ic_do_not_disturb_on_24dp.xml index 2b49afe39b6df5bdb205d10a617c4d7c21c02470..cace8d4433f59bd3848bf9e8c8d75e9226d1172e 100644 --- a/res/drawable/ic_settings_notifications.xml +++ b/res/drawable/ic_do_not_disturb_on_24dp.xml @@ -1,5 +1,5 @@ + android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/> + diff --git a/res/drawable/ic_event.xml b/res/drawable/ic_event.xml new file mode 100644 index 0000000000000000000000000000000000000000..a82d75449857054e9c1b7ce0576093160504b2bb --- /dev/null +++ b/res/drawable/ic_event.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_event_white.xml similarity index 58% rename from res/drawable/ic_settings_print.xml rename to res/drawable/ic_event_white.xml index 0eab4021956bbd84bdcb93b4807cdcabe50faf74..d80429b7ec06d105733d618a3822dd4485db3249 100644 --- a/res/drawable/ic_settings_print.xml +++ b/res/drawable/ic_event_white.xml @@ -1,7 +1,7 @@ - - - - \ No newline at end of file diff --git a/res/drawable/ic_homepage_accessibility.xml b/res/drawable/ic_homepage_accessibility.xml new file mode 100644 index 0000000000000000000000000000000000000000..07c9ef2ff84c1b4af1c66ba83b1966b01a3e162d --- /dev/null +++ b/res/drawable/ic_homepage_accessibility.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_accounts.xml b/res/drawable/ic_homepage_accounts.xml new file mode 100644 index 0000000000000000000000000000000000000000..ee3350585dd52841f4f648da8cc1e2cd297e933f --- /dev/null +++ b/res/drawable/ic_homepage_accounts.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_apps.xml b/res/drawable/ic_homepage_apps.xml new file mode 100644 index 0000000000000000000000000000000000000000..3d18d096074a1450bb86eb59a235084db4e2d796 --- /dev/null +++ b/res/drawable/ic_homepage_apps.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_battery.xml b/res/drawable/ic_homepage_battery.xml new file mode 100644 index 0000000000000000000000000000000000000000..abafdcbd3b285725d867ed7e69acce9a452d248a --- /dev/null +++ b/res/drawable/ic_homepage_battery.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_connected_device.xml b/res/drawable/ic_homepage_connected_device.xml new file mode 100644 index 0000000000000000000000000000000000000000..483427c3163441894f457be2a59975a2e82e0d4d --- /dev/null +++ b/res/drawable/ic_homepage_connected_device.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_display.xml b/res/drawable/ic_homepage_display.xml new file mode 100644 index 0000000000000000000000000000000000000000..893a58318690b1495e8582652983c261a42a0ce4 --- /dev/null +++ b/res/drawable/ic_homepage_display.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_generic_background.xml b/res/drawable/ic_homepage_generic_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..37273a013d02562573ce34847a33a4bee2404aa6 --- /dev/null +++ b/res/drawable/ic_homepage_generic_background.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_homepage_network.xml b/res/drawable/ic_homepage_network.xml new file mode 100644 index 0000000000000000000000000000000000000000..5ed023ac3d4769a5b3e676b526a4f80d0aba19f5 --- /dev/null +++ b/res/drawable/ic_homepage_network.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_security.xml b/res/drawable/ic_homepage_security.xml new file mode 100644 index 0000000000000000000000000000000000000000..5a6ed972261cb32669e03a75a37308bae30f746c --- /dev/null +++ b/res/drawable/ic_homepage_security.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_sound.xml b/res/drawable/ic_homepage_sound.xml new file mode 100644 index 0000000000000000000000000000000000000000..a7369ad257c656606e6e20158dd673381bfccbdf --- /dev/null +++ b/res/drawable/ic_homepage_sound.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_storage.xml b/res/drawable/ic_homepage_storage.xml new file mode 100644 index 0000000000000000000000000000000000000000..604cf51ce47b939344828096448e670e5c0360fb --- /dev/null +++ b/res/drawable/ic_homepage_storage.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_support.xml b/res/drawable/ic_homepage_support.xml new file mode 100644 index 0000000000000000000000000000000000000000..093630470bdcab2a9a36007862c698c6889d1fc9 --- /dev/null +++ b/res/drawable/ic_homepage_support.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_system_dashboard.xml b/res/drawable/ic_homepage_system_dashboard.xml new file mode 100644 index 0000000000000000000000000000000000000000..60f04763d85ebce8ded73db53c042ee38e832b21 --- /dev/null +++ b/res/drawable/ic_homepage_system_dashboard.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..3d8b89fc5577458342168c747137ed276a467a5e --- /dev/null +++ b/res/drawable/ic_info_outline_24dp.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/res/drawable/ic_local_movies.xml b/res/drawable/ic_local_movies.xml index 99977237452a25c8523aae2a45e551dfba979ff1..be9d122cb8131ec9fa5f0102a8f363507cce38e6 100644 --- a/res/drawable/ic_local_movies.xml +++ b/res/drawable/ic_local_movies.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M20,4h-3l2,4h-3l-2,-4h-2l2,4h-3L9,4H7l2,4H6L4,4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18L4,18v-8h16V18z"/> diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml new file mode 100644 index 0000000000000000000000000000000000000000..45748028d2209c2d65457acc77b4c5990076146c --- /dev/null +++ b/res/drawable/ic_local_phone_24_lib.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/res/drawable/ic_media_stream.xml b/res/drawable/ic_media_stream.xml index 4eb78bcf35b9f771659f76f669307bbf0504389d..122e9c586095aa33021f3ab3926ba35a4d825b11 100644 --- a/res/drawable/ic_media_stream.xml +++ b/res/drawable/ic_media_stream.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M12,3l0.01,10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55C7.79,13 6,14.79 6,17c0,2.21 1.79,4 4.01,4S14,19.21 14,17V7h4V3H12zM10.01,19c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C12.01,18.1 11.11,19 10.01,19z"/> diff --git a/res/drawable/ic_media_stream_off.xml b/res/drawable/ic_media_stream_off.xml new file mode 100644 index 0000000000000000000000000000000000000000..c8d5978fb3a486c6fe9a23d366e12ebac279b6c9 --- /dev/null +++ b/res/drawable/ic_media_stream_off.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml index 9e2175b7c616727df65dfb014042149ef8597d73..0313d623176841b25d1a1b7ca73fb6c96ca09b1b 100644 --- a/res/drawable/ic_menu_add.xml +++ b/res/drawable/ic_menu_add.xml @@ -20,7 +20,7 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?android:attr/colorAccent"> + android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FFFFFFFF" + android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/> + diff --git a/res/drawable/ic_notifications_off_24dp.xml b/res/drawable/ic_notifications_off_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..162202533137b31009f43821446db96c78aefb96 --- /dev/null +++ b/res/drawable/ic_notifications_off_24dp.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/res/drawable/ic_ota_update_available.xml b/res/drawable/ic_ota_update_available.xml index be81ea894fdc41399fabe5ea5720420ae08f9e75..b03f9d741aa1adc58786eea1d063f3ab97a107ac 100644 --- a/res/drawable/ic_ota_update_available.xml +++ b/res/drawable/ic_ota_update_available.xml @@ -20,8 +20,6 @@ android:viewportHeight="24"> - + android:fillColor="#FFF44336" + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/> diff --git a/res/drawable/ic_ota_update_current.xml b/res/drawable/ic_ota_update_current.xml index e5697745332e646df26e3efbbb56b1220a4eeba5..c38a0838d57fa91ccb44ba35d4b24c0655ebd5d0 100644 --- a/res/drawable/ic_ota_update_current.xml +++ b/res/drawable/ic_ota_update_current.xml @@ -20,8 +20,6 @@ android:viewportHeight="24"> - + android:fillColor="#FF43A047" + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11.14,16l-3.84,-3.84l1.41,-1.42l2.43,2.42l4.16,-4.16l1.42,1.41L11.14,16z"/> diff --git a/res/drawable/ic_ota_update_none.xml b/res/drawable/ic_ota_update_none.xml index a01a459c164df4bc9f22ca2154e873f542ab85cb..b49b4247646f7a9c64a6cd0fe801b70127f6ffb2 100644 --- a/res/drawable/ic_ota_update_none.xml +++ b/res/drawable/ic_ota_update_none.xml @@ -14,19 +14,12 @@ limitations under the License. --> - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + android:fillColor="#FFF44336" + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/> diff --git a/res/drawable/ic_ota_update_stale.xml b/res/drawable/ic_ota_update_stale.xml index 57bd6d5c95a1043aba5dc5ecd0bf02a02617d012..b49b4247646f7a9c64a6cd0fe801b70127f6ffb2 100644 --- a/res/drawable/ic_ota_update_stale.xml +++ b/res/drawable/ic_ota_update_stale.xml @@ -20,8 +20,6 @@ android:viewportHeight="24"> - + android:fillColor="#FFF44336" + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/> diff --git a/res/drawable/ic_package_verifier_disabled.xml b/res/drawable/ic_package_verifier_disabled.xml index 59e713a3afcb8d445a61b6a064c53a1d0fc5c70d..49fe0d33ae65826a0b1bae48d046afe2679ad09a 100644 --- a/res/drawable/ic_package_verifier_disabled.xml +++ b/res/drawable/ic_package_verifier_disabled.xml @@ -20,8 +20,6 @@ android:viewportHeight="24"> - + android:fillColor="#FFEF6C00" + android:pathData="M12,4.24l6,3v4.1c0,3.9 -2.55,7.5 -6,8.59c-3.45,-1.09 -6,-4.7 -6,-8.59v-4.1L12,4.24M12,2L4,6v5.33c0,4.93 3.41,9.55 8,10.67c4.59,-1.12 8,-5.73 8,-10.67V6L12,2L12,2zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/> diff --git a/res/drawable/ic_package_verifier_enabled.xml b/res/drawable/ic_package_verifier_enabled.xml index 9a2dee55b7eb4c68ef7bfceafa2a3262744a1de0..1e09eee9b15f645c3448f144a2ed5c856433456b 100644 --- a/res/drawable/ic_package_verifier_enabled.xml +++ b/res/drawable/ic_package_verifier_enabled.xml @@ -20,8 +20,6 @@ android:viewportHeight="24"> - + android:fillColor="#FF43A047" + android:pathData="M11.14,16l-3.84,-3.84l1.41,-1.42l2.43,2.42l4.16,-4.16l1.42,1.41L11.14,16zM12,4.24l6,3v4.1c0,3.9 -2.55,7.5 -6,8.59c-3.45,-1.09 -6,-4.7 -6,-8.59v-4.1L12,4.24M12,2L4,6v5.33c0,4.93 3.41,9.55 8,10.67c4.59,-1.12 8,-5.73 8,-10.67V6L12,2L12,2z"/> diff --git a/res/drawable/ic_package_verifier_removed.xml b/res/drawable/ic_package_verifier_removed.xml new file mode 100644 index 0000000000000000000000000000000000000000..d3680e70924505ca88dd535e3ae9e10425782a8b --- /dev/null +++ b/res/drawable/ic_package_verifier_removed.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_perm_device_information_green_24dp.xml b/res/drawable/ic_perm_device_information_green_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..e309b404e9c52d1ea5d3116705538ef9a985e055 --- /dev/null +++ b/res/drawable/ic_perm_device_information_green_24dp.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_perm_device_information_red_24dp.xml similarity index 58% rename from res/drawable/ic_settings_storage.xml rename to res/drawable/ic_perm_device_information_red_24dp.xml index 36dcc3870ebf936a5dea75984329cc5636ee631d..d375c0bc603375018406d9765d8c1fbfc8cdb4e9 100644 --- a/res/drawable/ic_settings_storage.xml +++ b/res/drawable/ic_perm_device_information_red_24dp.xml @@ -13,13 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. --> + + android:tint="?android:attr/colorError"> + + + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/> diff --git a/res/drawable/ic_photo_library.xml b/res/drawable/ic_photo_library.xml index 732a34858ae3dfe738ea3763e86c3863253b63e0..a1a58c299e5b07794162e80be706f74521c5d9fb 100644 --- a/res/drawable/ic_photo_library.xml +++ b/res/drawable/ic_photo_library.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M20,4v12H8V4H20M20,2H8C6.9,2 6,2.9 6,4v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2L20,2zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2zM15.67,11l-2.5,2.98L11.5,11.8L9,15h10L15.67,11z"/> diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_sd_card.xml similarity index 56% rename from res/drawable/ic_menu_delete.xml rename to res/drawable/ic_sd_card.xml index 74f63c339c73faaa2c886e92b6c75edc0eaf8f08..ff88779a75971c0812fce7e89b619c46e7154919 100644 --- a/res/drawable/ic_menu_delete.xml +++ b/res/drawable/ic_sd_card.xml @@ -1,5 +1,5 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z" + android:fillColor="#000000"/> diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml index da343457cad755123810784c52f2ba90cb594ead..ac4c43bd35b918c5bfa71c09b1c354fb92f09a86 100644 --- a/res/drawable/ic_settings_24dp.xml +++ b/res/drawable/ic_settings_24dp.xml @@ -21,6 +21,9 @@ android:viewportHeight="24.0" android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FFFFFFFF" + android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/> + diff --git a/res/drawable/ic_settings_24dp_inverse.xml b/res/drawable/ic_settings_24dp_inverse.xml deleted file mode 100644 index 6f70d21e256af28f5a16bca9ae5ef054328d5689..0000000000000000000000000000000000000000 --- a/res/drawable/ic_settings_24dp_inverse.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/drawable/ic_settings_about.xml b/res/drawable/ic_settings_about.xml index 887fca60c123a43cb242b60ef22c24744467a17a..4f13530918bb6a8a35eb9434d307d764917b2b89 100644 --- a/res/drawable/ic_settings_about.xml +++ b/res/drawable/ic_settings_about.xml @@ -21,11 +21,11 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M11,7h2v2h-2z"/> + android:pathData="M11,11h2v6h-2z"/> + android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/> diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml index 4cf518254d500a43130821b0ed34f481d9045325..d5c89b96fb358f1249e0da68df41eb8f1d3c14d4 100644 --- a/res/drawable/ic_settings_accessibility.xml +++ b/res/drawable/ic_settings_accessibility.xml @@ -17,9 +17,11 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:pathData="M20.5,4c-2.61,0.7 -5.67,1 -8.5,1S6.11,4.7 3.5,4L3,6c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V7c2,-0.17 4.14,-0.5 6,-1L20.5,4zM12,4c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,4 12,4z"/> + diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml index 154c09c09dcffd04b805bacdebfb970efdd11846..7f182866d4875668e65edab86a3c8863c69a1ce4 100644 --- a/res/drawable/ic_settings_accounts.xml +++ b/res/drawable/ic_settings_accounts.xml @@ -14,16 +14,14 @@ limitations under the License. --> + android:viewportHeight="24.0"> + android:pathData="M19,3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,5v10.79C16.52,14.37 13.23,14 12,14s-4.52,0.37 -7,1.79V5H19zM5,19v-0.77C6.74,16.66 10.32,16 12,16s5.26,0.66 7,2.23V19H5z"/> + diff --git a/res/drawable/ic_settings_aod.xml b/res/drawable/ic_settings_aod.xml new file mode 100644 index 0000000000000000000000000000000000000000..8d9134947ee5b5c4d2c9dabb81a0094591369d24 --- /dev/null +++ b/res/drawable/ic_settings_aod.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_settings_backup.xml b/res/drawable/ic_settings_backup.xml index 8a9997a387cb85ef8b95b6c9e56da952efd5726f..231eadd91eb4916cb047c867e9f95d58e73fa705 100644 --- a/res/drawable/ic_settings_backup.xml +++ b/res/drawable/ic_settings_backup.xml @@ -14,12 +14,12 @@ limitations under the License. --> + android:pathData="M17.92,10.02C17.45,7.18 14.97,5 12,5C9.82,5 7.83,6.18 6.78,8.06C4.09,8.41 2,10.74 2,13.5C2,16.53 4.47,19 7.5,19h10c2.48,0 4.5,-2.02 4.5,-4.5C22,12.16 20.21,10.23 17.92,10.02zM17.5,17h-10C5.57,17 4,15.43 4,13.5c0,-1.89 1.54,-3.46 3.44,-3.49L8.08,10l0.26,-0.59C8.97,7.94 10.41,7 12,7c2.21,0 4,1.79 4,4v1h1.5c1.38,0 2.5,1.12 2.5,2.5S18.88,17 17.5,17zM14.09,11.09l1.41,1.41l-2.79,2.79L12,16l-0.71,-0.71L8.5,12.5l1.41,-1.41L11,12.17V9.5h2v2.67L14.09,11.09z"/> diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..255b75e7d9e1196b99ed309da9db42a84347839c --- /dev/null +++ b/res/drawable/ic_settings_battery_white.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml index de71508b841c4b8e06bb560a9efb2091238d99b4..7f0aacdf98693a707df6272e9689563083b28f4d 100644 --- a/res/drawable/ic_settings_display.xml +++ b/res/drawable/ic_settings_display.xml @@ -21,8 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M20,8.69V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69zM18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48zM12,17c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5V17z"/> diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..62dc21f305b024cebef56885eb988ec2ab3c1a39 --- /dev/null +++ b/res/drawable/ic_settings_display_white.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml index c774b2eb41489a4ab3781ce710a3964ecb6dad0c..34bd4f098b744e5dfd859303bf8f651c6e668ccb 100644 --- a/res/drawable/ic_settings_location.xml +++ b/res/drawable/ic_settings_location.xml @@ -21,5 +21,8 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/> + diff --git a/res/drawable/ic_settings_memory.xml b/res/drawable/ic_settings_memory.xml index 830dfc9746e4914e0ee9a01917ab4a8c359eee25..78a6b8d315eedc9a9a808ca769e480569e56ce9a 100644 --- a/res/drawable/ic_settings_memory.xml +++ b/res/drawable/ic_settings_memory.xml @@ -20,19 +20,6 @@ android:viewportHeight="24.0" android:tint="?android:attr/colorControlNormal"> + android:fillColor="@android:color/black" + android:pathData="M15,9H9v6h6V9zM21,11V9h-2V7c0,-1.1 -0.9,-2 -2,-2h-2V3h-2v2h-2V3H9v2H7C5.9,5 5,5.9 5,7v2H3v2h2v2H3v2h2v2c0,1.1 0.9,2 2,2h2v2h2v-2h2v2h2v-2h2c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2H21zM17,17H7V7h10V17z"/> diff --git a/res/drawable/ic_settings_multiuser.xml b/res/drawable/ic_settings_multiuser.xml index 4dd83a50e240273d3647e14ea5569c58ff8d2006..2d857c5ac619a40a2275fa42ccc1f8e76a450c5c 100644 --- a/res/drawable/ic_settings_multiuser.xml +++ b/res/drawable/ic_settings_multiuser.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M12,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2s-2,-0.9 -2,-2S10.9,6 12,6M12,15c2.7,0 5.8,1.29 6,2v1H6l0,-0.99C6.2,16.29 9.3,15 12,15M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4s4,-1.79 4,-4S14.21,4 12,4L12,4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3C20,14.34 14.67,13 12,13L12,13z"/> diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml index 34accd0d3806d90f4736ae931cbd51e3b855873a..055babc768e8340360ccdf4f45b912857f8e80c4 100644 --- a/res/drawable/ic_settings_security.xml +++ b/res/drawable/ic_settings_security.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/> diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..544ebef31d849596f12e25784794d38d0f2fd4e2 --- /dev/null +++ b/res/drawable/ic_settings_security_white.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_settings_sim.xml b/res/drawable/ic_settings_sim.xml index d083c9de6cfe04e597f999a7323521f9984119fe..3edda49e89c4f9772d8d2fc5d1bdc625b6ca8a18 100644 --- a/res/drawable/ic_settings_sim.xml +++ b/res/drawable/ic_settings_sim.xml @@ -16,13 +16,30 @@ --> - + android:pathData="M18,2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM18,4v16H6V8.83L10.83,4L18,4L18,4z"/> + + + + + + diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..5a697d4ab2121f5c52d8c655ee8badbac89f0011 --- /dev/null +++ b/res/drawable/ic_settings_system_dashboard_white.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/res/drawable/ic_settings_wireless_white.xml b/res/drawable/ic_settings_wireless_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..8dedb0d8ca7b12f0923b417242cd827e92c3de6c --- /dev/null +++ b/res/drawable/ic_settings_wireless_white.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_storage.xml b/res/drawable/ic_storage.xml index 36dcc3870ebf936a5dea75984329cc5636ee631d..55e66c3d8bce0bc2ca147b6608798eec2426bcf6 100644 --- a/res/drawable/ic_storage.xml +++ b/res/drawable/ic_storage.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z"/> diff --git a/res/drawable/ic_storage_white.xml b/res/drawable/ic_storage_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..eed91406ec136f51bd4f0faced6eb10ee3a39544 --- /dev/null +++ b/res/drawable/ic_storage_white.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_storage_wizard_external.xml b/res/drawable/ic_storage_wizard_external.xml new file mode 100644 index 0000000000000000000000000000000000000000..99e2698633d762016e50d49bb751f7e341512037 --- /dev/null +++ b/res/drawable/ic_storage_wizard_external.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_storage_wizard_internal.xml b/res/drawable/ic_storage_wizard_internal.xml new file mode 100644 index 0000000000000000000000000000000000000000..41768f7727d9269c7393113a130eaa2890a34129 --- /dev/null +++ b/res/drawable/ic_storage_wizard_internal.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml index 5a8f0e943420f6a470dfcf1e5bb9f4c5c931a830..d15d13a8c20b96369f9976c41baa141108f2f9ec 100644 --- a/res/drawable/ic_suggested_notifications.xml +++ b/res/drawable/ic_suggested_notifications.xml @@ -14,11 +14,14 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/> + diff --git a/res/drawable/ic_bt_laptop.xml b/res/drawable/ic_suggestion_close_button.xml similarity index 60% rename from res/drawable/ic_bt_laptop.xml rename to res/drawable/ic_suggestion_close_button.xml index 029e4d913434adb578a3c6fc33fb053fd7895440..615b21567370186510f734c099e2c981bfd24cb9 100644 --- a/res/drawable/ic_bt_laptop.xml +++ b/res/drawable/ic_suggestion_close_button.xml @@ -1,5 +1,5 @@ + + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> - \ No newline at end of file + android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/> + diff --git a/res/drawable/ic_swap_horiz.xml b/res/drawable/ic_swap_horiz.xml new file mode 100644 index 0000000000000000000000000000000000000000..a38833becab9402822eb4102348988ab5dde5070 --- /dev/null +++ b/res/drawable/ic_swap_horiz.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml index ef8f9913bc316fe020f7e0ff7bc872366c66018a..3325fdd5c01aa6b744ac58e795cb4e0858b57b54 100644 --- a/res/drawable/ic_system_update.xml +++ b/res/drawable/ic_system_update.xml @@ -20,6 +20,6 @@ android:viewportHeight="24.0" android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FFFFFFFF" + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/> diff --git a/res/drawable/ic_system_update_vd_theme_24.xml b/res/drawable/ic_system_update_vd_theme_24.xml index d68ea13774dbc9df0d8ebecbc083e0d434146dd1..d1fc0616bf02331bc945018f69c82921d6a00e43 100644 --- a/res/drawable/ic_system_update_vd_theme_24.xml +++ b/res/drawable/ic_system_update_vd_theme_24.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> - \ No newline at end of file + android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/> + diff --git a/res/drawable/ic_timelapse.xml b/res/drawable/ic_timelapse.xml new file mode 100644 index 0000000000000000000000000000000000000000..ba97bae8c907384c8562c830e27a84f01c7563eb --- /dev/null +++ b/res/drawable/ic_timelapse.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_timelapse_white.xml similarity index 54% rename from res/drawable/ic_settings_bluetooth.xml rename to res/drawable/ic_timelapse_white.xml index 6e32e1a7f631e8e2f4c9182afe02ee1e6d939c85..f287747d2bc052cff2dc560928a9042f239e916a 100644 --- a/res/drawable/ic_settings_bluetooth.xml +++ b/res/drawable/ic_timelapse_white.xml @@ -1,7 +1,7 @@ + + + + + diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..8c68c0070f92e23911c402861b4584e013e331dc --- /dev/null +++ b/res/drawable/ic_volume_up_24dp.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/res/drawable/ic_vpn_key.xml b/res/drawable/ic_vpn_key.xml index 71b29d651a8a44f132127089586ae5ab43cf3981..c2a7e342397ed3b1af0ab346bc56c7a1329d8864 100644 --- a/res/drawable/ic_vpn_key.xml +++ b/res/drawable/ic_vpn_key.xml @@ -20,7 +20,9 @@ android:viewportHeight="24.0" android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FFFFFFFF" + android:pathData="M12.09,9C11.11,7.5 9.43,6.5 7.5,6.5C4.46,6.5 2,8.96 2,12c0,3.04 2.46,5.5 5.5,5.5c1.93,0 3.61,-1 4.59,-2.5H14v3h6v-3h2V9H12.09zM20,13h-2v3h-2v-3h-5.16c-0.43,1.44 -1.76,2.5 -3.34,2.5C5.57,15.5 4,13.93 4,12c0,-1.93 1.57,-3.5 3.5,-3.5c1.58,0 2.9,1.06 3.34,2.5H20V13z"/> + diff --git a/res/drawable/ic_warning_24dp.xml b/res/drawable/ic_warning_24dp.xml index 8e9fee34b2864b5977b58887cfacf3d12d60d9d9..2ca48e0fb068a98bf8b7934c2d9dccfb463b8ec0 100644 --- a/res/drawable/ic_warning_24dp.xml +++ b/res/drawable/ic_warning_24dp.xml @@ -1,5 +1,5 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/line_drawable.xml b/res/drawable/line_drawable.xml new file mode 100644 index 0000000000000000000000000000000000000000..a524c6145eb5558047f62f1939f9da19844a838a --- /dev/null +++ b/res/drawable/line_drawable.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ring_progress.xml b/res/drawable/ring_progress.xml index 02fcd5bf30cb08b6dbfcba45c2bc0a1ad664233b..346ff5f5bed7422916d7b4a689593bd2af9d391b 100644 --- a/res/drawable/ring_progress.xml +++ b/res/drawable/ring_progress.xml @@ -22,7 +22,7 @@ android:thickness="@dimen/ring_progress_bar_thickness" android:useLevel="false" android:tint="?android:colorControlNormal"> - + diff --git a/res/drawable/thumb.xml b/res/drawable/thumb.xml new file mode 100644 index 0000000000000000000000000000000000000000..42fbd8cc115e5cbd3c97f4a0f59d42a60240947a --- /dev/null +++ b/res/drawable/thumb.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/thumb_drawable.xml b/res/drawable/thumb_drawable.xml new file mode 100644 index 0000000000000000000000000000000000000000..b99536dec95530d0440a84357d6dbbf51ceef51c --- /dev/null +++ b/res/drawable/thumb_drawable.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/res/drawable/tile_icon_winscope_trace.xml b/res/drawable/tile_icon_winscope_trace.xml new file mode 100644 index 0000000000000000000000000000000000000000..256304944768d9706e7909144c33b1d3867964cf --- /dev/null +++ b/res/drawable/tile_icon_winscope_trace.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml index 8e78b056078872e51dfbb3580b8eabbed9ed2ef8..4d6f798c39c8dc868be4134f91a5d32b0082a8a7 100644 --- a/res/layout-land/choose_lock_pattern.xml +++ b/res/layout-land/choose_lock_pattern.xml @@ -48,6 +48,7 @@ style="@style/SuwGlifIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="?attr/suwGlifHeaderGravity" android:layout_marginStart="0dp" android:layout_marginEnd="0dp" android:src="@drawable/ic_lock"/> @@ -71,15 +72,32 @@ android:layout_marginStart="0dp" android:layout_marginEnd="0dp"/> + + +