diff --git a/Android.bp b/Android.bp index ce6a1b4d9be..8e075b6db90 100644 --- a/Android.bp +++ b/Android.bp @@ -3,6 +3,21 @@ java_library { srcs: ["src/**/*.logtags"], } +genrule { + name: "statslog-settings-java-gen", + tools: ["stats-log-api-gen"], + cmd: "$(location stats-log-api-gen) --java $(out) --module settings" + + " --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog", + out: ["com/android/settings/core/instrumentation/SettingsStatsLog.java"], +} + +java_library { + name: "statslog-settings", + srcs: [ + ":statslog-settings-java-gen", + ], +} + // Build the Settings APK android_library { name: "Settings-core", @@ -36,22 +51,35 @@ android_library { "settings-log-bridge-protos-lite", "contextualcards", "settings-logtags", + "statslog-settings", "zxing-core-1.7", + "android.hardware.dumpstate-V1.0-java", + "android.hardware.dumpstate-V1.1-java", ], libs: [ "telephony-common", "ims-common", + "app-compat-annotations", ], } +platform_compat_config { + name: "settings-platform-compat-config", + src: ":Settings-core", + system_ext_specific: true, +} + android_app { name: "Settings", platform_apis: true, certificate: "platform", system_ext_specific: true, privileged: true, - required: ["privapp_whitelist_com.android.settings"], + required: [ + "privapp_whitelist_com.android.settings", + "settings-platform-compat-config", + ], static_libs: ["Settings-core"], resource_dirs: [], optimize: { diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8f3e0b51860..2f53cc1e7c8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,6 +8,7 @@ + @@ -30,8 +31,6 @@ - - @@ -41,6 +40,7 @@ + @@ -82,7 +82,6 @@ - @@ -102,8 +101,10 @@ + - + + + android:taskAffinity="com.android.settings.root" + android:launchMode="singleTask" + android:configChanges="keyboard|keyboardHidden"> @@ -148,6 +151,7 @@ @@ -165,9 +169,7 @@ - + @@ -184,8 +186,7 @@ + android:icon="@drawable/ic_homepage_network"> @@ -204,8 +205,7 @@ + android:label="@string/network_settings_title"> @@ -219,8 +219,7 @@ + android:icon="@drawable/ic_homepage_connected_device"> @@ -255,9 +254,8 @@ + android:icon="@drawable/ic_homepage_network" + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -273,8 +271,26 @@ + android:name="Settings$WifiSettings2Activity" + android:label="@string/wifi_settings" + android:icon="@drawable/ic_homepage_network" + android:configChanges="orientation|keyboardHidden|screenSize"> + + + + + + + + + + + + + @@ -287,8 +303,7 @@ android:name="Settings$ConfigureWifiSettingsActivity" android:label="@string/wifi_configure_settings_preference_title" android:icon="@drawable/ic_settings_wireless" - android:configChanges="orientation|keyboardHidden|screenSize" - android:parentActivityName="Settings"> + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -308,8 +323,7 @@ android:name="Settings$SavedAccessPointsSettingsActivity" android:label="@string/wifi_saved_access_points_label" android:icon="@drawable/ic_settings_wireless" - android:configChanges="orientation|keyboardHidden|screenSize" - android:parentActivityName="Settings"> + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -377,7 +391,6 @@ @@ -479,8 +492,7 @@ + android:icon="@drawable/ic_homepage_network"> @@ -494,8 +506,7 @@ + android:icon="@drawable/ic_wifi_tethering"> @@ -519,8 +530,7 @@ android:value="com.android.settings.TetherSettings" /> - + @@ -533,8 +543,7 @@ + android:icon="@drawable/ic_settings_wireless"> @@ -552,8 +561,7 @@ + android:label="@string/data_saver_title"> @@ -565,8 +573,7 @@ + android:icon="@drawable/ic_settings_date_time"> @@ -577,14 +584,8 @@ - - - - - + android:value="com.android.settings.datetime.DateTimeSettings" /> @@ -592,8 +593,7 @@ + android:icon="@drawable/ic_settings_language"> @@ -618,19 +618,12 @@ + android:icon="@drawable/ic_settings_language"> - - - - - + android:label="@string/spellcheckers_settings_title"> @@ -716,8 +708,7 @@ + android:label="@string/user_dict_settings_title"> @@ -747,7 +738,7 @@ @@ -762,13 +753,13 @@ + android:value="com.android.settings.notification.zen.ZenModeSettings" /> @@ -790,12 +781,11 @@ + android:exported="true"> @@ -805,8 +795,7 @@ android:name="Settings$ZenModeAutomationSettingsActivity" android:label="@string/zen_mode_automation_settings_title" android:icon="@drawable/ic_notifications" - android:exported="true" - android:parentActivityName="Settings$ZenModeSettingsActivity"> + android:exported="true"> @@ -816,7 +805,7 @@ + android:value="com.android.settings.notification.zen.ZenModeAutomationSettings" /> @@ -869,8 +858,7 @@ + android:exported="true"> @@ -880,21 +868,20 @@ + android:value="com.android.settings.notification.zen.ZenModeScheduleRuleSettings" /> + android:exported="true"> + android:value="com.android.settings.notification.zen.ZenModeEventRuleSettings" /> @@ -902,8 +889,7 @@ + android:icon="@drawable/ic_homepage_display"> @@ -923,7 +909,7 @@ android:name="Settings$NightDisplaySettingsActivity" android:label="@string/night_display_title" android:enabled="@*android:bool/config_nightDisplayAvailable" - android:icon="@drawable/ic_settings_night_display"> + android:icon="@drawable/ic_homepage_night_display"> @@ -997,8 +983,7 @@ + android:configChanges="orientation|screenSize"> @@ -1049,8 +1034,7 @@ + android:label="@string/domain_urls_title"> @@ -1072,8 +1056,7 @@ + android:label="@string/high_power_apps"> @@ -1153,6 +1136,7 @@ android:targetActivity=".applications.InstalledAppDetailsTop"> + @@ -1171,8 +1155,7 @@ + android:label="@string/runningservices_settings_title"> @@ -1188,8 +1171,7 @@ + android:label="@string/storageuse_settings_title"> @@ -1208,17 +1190,29 @@ + android:label="@string/notification_log_title"> + android:value="com.android.settings.notification.history.NotificationStation" /> - + + + + + + + + + + + @@ -1232,8 +1226,7 @@ android:name="Settings$LocationSettingsActivity" android:label="@string/location_settings_title" android:icon="@drawable/ic_homepage_location" - android:configChanges="orientation|keyboardHidden|screenSize" - android:parentActivityName="Settings"> + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -1251,8 +1244,7 @@ android:name="Settings$ScanningSettingsActivity" android:label="@string/location_scanning_screen_title" android:icon="@drawable/ic_homepage_location" - android:configChanges="orientation|keyboardHidden|screenSize" - android:parentActivityName="Settings"> + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -1267,8 +1259,7 @@ android:name=".Settings$SecurityDashboardActivity" android:label="@string/security_settings_title" android:icon="@drawable/ic_homepage_security" - android:configChanges="orientation|keyboardHidden|screenSize" - android:parentActivityName="Settings"> + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -1298,8 +1289,7 @@ + android:icon="@drawable/ic_settings_security"> @@ -1314,8 +1304,7 @@ + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -1359,10 +1348,14 @@ + + + + android:label="@string/device_admin_settings_title"> @@ -1409,12 +1402,13 @@ + + android:label="@string/usage_access_title"> @@ -1440,8 +1434,7 @@ android:name="Settings$AccessibilitySettingsActivity" android:label="@string/accessibility_settings" android:icon="@drawable/ic_homepage_accessibility" - android:configChanges="orientation|keyboardHidden|screenSize" - android:parentActivityName="Settings"> + android:configChanges="orientation|keyboardHidden|screenSize"> @@ -1502,8 +1495,7 @@ + android:label="@string/accessibility_display_daltonizer_preference_title"> @@ -1520,8 +1512,7 @@ + android:label="@string/accessibility_captioning_title"> @@ -1552,8 +1543,7 @@ + android:label="@string/enterprise_privacy_settings"> @@ -1627,6 +1617,10 @@ android:windowSoftInputMode="stateHidden|adjustResize" android:theme="@style/GlifTheme.Light"/> + + @@ -1818,8 +1812,7 @@ + android:icon="@drawable/ic_homepage_storage"> @@ -1844,8 +1837,7 @@ + android:label="@string/storage_settings_title"> @@ -1926,7 +1918,6 @@ android:name="Settings$DevelopmentSettingsDashboardActivity" android:label="@string/development_settings_title" android:icon="@drawable/ic_settings_development" - android:parentActivityName="Settings" android:enabled="false"> @@ -1965,8 +1956,7 @@ + android:icon="@drawable/ic_settings_print"> @@ -1981,8 +1971,7 @@ + android:label="@string/print_print_job"> @@ -1993,12 +1982,37 @@ + + + + + + + + + + + + + + + + android:label="@string/android_beam_settings_title"> @@ -2113,18 +2126,11 @@ + android:icon="@drawable/ic_cast_24dp"> - - - - - @@ -2163,8 +2169,7 @@ + android:label="@string/usage_stats_label"> @@ -2174,8 +2179,7 @@ + android:icon="@drawable/ic_homepage_battery"> @@ -2191,8 +2195,7 @@ + android:icon="@drawable/ic_settings_battery"> @@ -2216,8 +2219,7 @@ + android:label="@string/account_sync_settings_title"> @@ -2230,7 +2232,6 @@ @@ -2244,8 +2245,7 @@ android:name="com.android.settings.accounts.AddAccountSettings" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:configChanges="orientation|keyboardHidden|screenSize" - android:label="@string/header_add_an_account" - android:parentActivityName="Settings"> + android:label="@string/header_add_an_account"> @@ -2270,6 +2270,7 @@ android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode" android:windowSoftInputMode="adjustResize" android:screenOrientation="nosensor" + android:taskAffinity="com.android.settings.CryptKeeper" android:process=":CryptKeeper"> @@ -2318,8 +2319,7 @@ + android:icon="@drawable/ic_settings_data_usage"> @@ -2328,16 +2328,12 @@ - - - + android:label="@string/cellular_data_usage"> @@ -2349,8 +2345,7 @@ + android:icon="@drawable/ic_settings_display"> @@ -2364,8 +2359,7 @@ + android:icon="@drawable/ic_settings_multiuser"> @@ -2375,18 +2369,19 @@ + android:value="com.android.settings.category.ia.system" /> + + android:value="com.android.settings.users.UserSettings" /> + android:value="true" /> + android:icon="@drawable/ic_settings_nfc_payment"> @@ -2415,14 +2410,12 @@ + android:label="@string/manage_notification_access_title"> @@ -2431,10 +2424,20 @@ android:value="com.android.settings.notification.NotificationAccessSettings" /> + + + + + + + + + android:label="@string/notification_assistant_title"> @@ -2445,8 +2448,7 @@ + android:label="@string/vr_listeners_title"> @@ -2457,8 +2459,7 @@ + android:label="@string/picture_in_picture_title"> @@ -2473,8 +2474,7 @@ + android:label="@string/picture_in_picture_title"> @@ -2484,6 +2484,28 @@ android:value="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails" /> + + + + + + + + + + + + + + + + + + android:label="@string/manage_zen_access_title"> + android:value="com.android.settings.notification.zen.ZenAccessSettings" /> + android:exported="true"> @@ -2522,38 +2542,42 @@ - - - - - - + + + + + + + + + + android:label="@string/bubbles_app_toggle_title"> + android:value="com.android.settings.notification.app.AppBubbleNotificationSettings" /> + android:exported="true"> @@ -2591,7 +2615,7 @@ + android:value="com.android.settings.notification.app.AppNotificationSettings" /> @@ -2603,14 +2627,13 @@ + android:value="com.android.settings.notification.app.ChannelNotificationSettings" /> @@ -2624,7 +2647,6 @@ @@ -2674,10 +2696,6 @@ android:grantUriPermissions="true" android:exported="false"/> - - + android:label="@string/draw_overlay"> - - - - + android:value="com.android.settings.applications.manageapplications.ManageApplications" /> + + + + + + + + + + + android:label="@string/write_settings_title"> + + android:label="@string/write_settings_title"> @@ -2846,14 +2870,15 @@ + android:label="@string/install_other_apps"> + + + + + + + + + + + + + + + + + + + + android:name=".dashboard.SummaryProvider" + android:authorities="com.android.settings.dashboard.SummaryProvider"> + android:value="content://com.android.settings.dashboard.SummaryProvider/backup" /> + android:label="@string/automatic_storage_manager_settings"> @@ -2950,7 +2998,6 @@ android:name=".Settings$AppAndNotificationDashboardActivity" android:label="@string/app_and_notification_dashboard_title" android:icon="@drawable/ic_homepage_apps" - android:parentActivityName="Settings" android:exported="true"> @@ -2959,8 +3006,7 @@ + android:icon="@drawable/ic_homepage_accounts"> @@ -2978,8 +3024,7 @@ + android:icon="@drawable/ic_homepage_system_dashboard"> @@ -3014,6 +3059,8 @@ + + + + + + + + + + + + + + android:label="@string/connected_device_connections_title"> @@ -3113,14 +3182,15 @@ + android:permission="android.permission.BLUETOOTH_ADMIN"> + @@ -3147,15 +3218,30 @@ + + + + + + + + + + + + android:label="@string/battery_saver_schedule_settings_title"> @@ -3261,7 +3346,7 @@ + android:label="@string/cards_passes_sentence"> @@ -3270,6 +3355,55 @@ android:value="com.android.settings.gestures.GlobalActionsPanelSettings" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OWNERS b/OWNERS index ccf8e813739..47961cd8653 100644 --- a/OWNERS +++ b/OWNERS @@ -1,22 +1,15 @@ # Use this reviewer by default. -pixel-sw-exp-reviews+gerrit@google.com +android-settings-core-eng+gerrit@google.com # People who can approve changes for submission -asapperstein@google.com -asargent@google.com -dehboxturtle@google.com -dhnishi@google.com +chiujason@google.com edgarwang@google.com emilychuang@google.com -jackqdyulei@google.com -lindatseng@google.com -mfritze@google.com -rafftsai@google.com +millchen@google.com +stanleytfwang@google.com +sunnyshao@google.com tmfang@google.com -zhfan@google.com - -# Emergency approvers in case the above are not available -miket@google.com +yantingyang@google.com # Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS) per-file *.xml=* diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 3cb964fefd8..f959f918a74 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -1,18 +1,6 @@ - - - - @@ -1081,7 +1069,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1097,7 +1085,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1113,7 +1101,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1129,7 +1117,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1145,7 +1133,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1161,7 +1149,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1177,7 +1165,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1193,7 +1181,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1209,7 +1197,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1225,7 +1213,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1241,7 +1229,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1257,7 +1245,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1273,7 +1261,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1289,7 +1277,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1305,7 +1293,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1321,7 +1309,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1337,7 +1325,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1353,7 +1341,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1369,7 +1357,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1385,7 +1373,295 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1433,7 +1709,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1501,6 +1777,22 @@ column="9"/> + + + + + + + + + + + + @@ -2581,27 +2905,11 @@ priority="4" summary="Using hardcoded color" explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app." - errorLine1=" <string name="sync_plug" msgid="3905078969081888738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎"<font fgcolor="#ffffffff">"‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎"</font>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎"</string>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~"> - - - - @@ -2613,11 +2921,11 @@ priority="4" summary="Using hardcoded color" explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app." - errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" + errorLine1=" <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2629,11 +2937,11 @@ priority="4" summary="Using hardcoded color" explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app." - errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" + errorLine1=" <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2645,14 +2953,30 @@ priority="4" summary="Using hardcoded color" explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app." - errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" + errorLine1=" <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> + + + + @@ -2697,7 +3021,7 @@ errorLine2=" ^"> @@ -2713,7 +3037,7 @@ errorLine2=" ^"> @@ -2729,7 +3053,7 @@ errorLine2=" ^"> @@ -2745,7 +3069,7 @@ errorLine2=" ^"> @@ -2761,7 +3085,7 @@ errorLine2=" ^"> @@ -2777,7 +3101,7 @@ errorLine2=" ^"> @@ -2793,7 +3117,7 @@ errorLine2=" ^"> @@ -2809,7 +3133,7 @@ errorLine2=" ^"> @@ -2825,7 +3149,7 @@ errorLine2=" ^"> @@ -2841,7 +3165,7 @@ errorLine2=" ^"> @@ -2857,7 +3181,7 @@ errorLine2=" ^"> @@ -2905,7 +3229,7 @@ errorLine2=" ^"> @@ -2921,7 +3245,7 @@ errorLine2=" ^"> @@ -2937,7 +3261,7 @@ errorLine2=" ^"> @@ -2953,7 +3277,7 @@ errorLine2=" ^"> @@ -2969,7 +3293,7 @@ errorLine2=" ^"> @@ -2985,7 +3309,7 @@ errorLine2=" ^"> @@ -3001,7 +3325,7 @@ errorLine2=" ^"> @@ -3037,36 +3361,4 @@ column="5"/> - - - - - - - - diff --git a/protos/contextual_card_list.proto b/protos/contextual_card_list.proto index 69c3741cada..54e5654fa5e 100644 --- a/protos/contextual_card_list.proto +++ b/protos/contextual_card_list.proto @@ -19,6 +19,7 @@ message ContextualCard { POSSIBLE = 2; IMPORTANT = 3; DEFERRED_SETUP = 5; + STICKY = 6; } /** Slice uri of the contextual card */ diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml index aed30c027aa..60654fc7824 100644 --- a/res/anim/enrollment_fingerprint_background_1_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml @@ -23,14 +23,12 @@ android:propertyName="fillColor" android:valueFrom="#000000" android:valueTo="#4285F4" - android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> + android:valueFrom="0.07" + android:valueTo="0.65" /> @@ -39,13 +37,11 @@ android:propertyName="fillColor" android:valueFrom="#4285F4" android:valueTo="#000000" - android:valueType="intType" android:interpolator="@android:interpolator/fast_out_slow_in" /> + android:valueFrom="0.65" + android:valueTo="0.07" /> diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml index aed30c027aa..60654fc7824 100644 --- a/res/anim/enrollment_fingerprint_background_2_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml @@ -23,14 +23,12 @@ android:propertyName="fillColor" android:valueFrom="#000000" android:valueTo="#4285F4" - android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> + android:valueFrom="0.07" + android:valueTo="0.65" /> @@ -39,13 +37,11 @@ android:propertyName="fillColor" android:valueFrom="#4285F4" android:valueTo="#000000" - android:valueType="intType" android:interpolator="@android:interpolator/fast_out_slow_in" /> + android:valueFrom="0.65" + android:valueTo="0.07" /> diff --git a/res/anim/enrollment_fingerprint_background_5_path_animation.xml b/res/anim/enrollment_fingerprint_background_5_path_animation.xml index aed30c027aa..60654fc7824 100644 --- a/res/anim/enrollment_fingerprint_background_5_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml @@ -23,14 +23,12 @@ android:propertyName="fillColor" android:valueFrom="#000000" android:valueTo="#4285F4" - android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> + android:valueFrom="0.07" + android:valueTo="0.65" /> @@ -39,13 +37,11 @@ android:propertyName="fillColor" android:valueFrom="#4285F4" android:valueTo="#000000" - android:valueType="intType" android:interpolator="@android:interpolator/fast_out_slow_in" /> + android:valueFrom="0.65" + android:valueTo="0.07" /> diff --git a/res/anim/enrollment_fingerprint_background_6_path_animation.xml b/res/anim/enrollment_fingerprint_background_6_path_animation.xml index aed30c027aa..60654fc7824 100644 --- a/res/anim/enrollment_fingerprint_background_6_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml @@ -23,14 +23,12 @@ android:propertyName="fillColor" android:valueFrom="#000000" android:valueTo="#4285F4" - android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> + android:valueFrom="0.07" + android:valueTo="0.65" /> @@ -39,13 +37,11 @@ android:propertyName="fillColor" android:valueFrom="#4285F4" android:valueTo="#000000" - android:valueType="intType" android:interpolator="@android:interpolator/fast_out_slow_in" /> + android:valueFrom="0.65" + android:valueTo="0.07" /> diff --git a/res/anim/enrollment_fingerprint_background_7_path_animation.xml b/res/anim/enrollment_fingerprint_background_7_path_animation.xml index aed30c027aa..60654fc7824 100644 --- a/res/anim/enrollment_fingerprint_background_7_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml @@ -23,14 +23,12 @@ android:propertyName="fillColor" android:valueFrom="#000000" android:valueTo="#4285F4" - android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> + android:valueFrom="0.07" + android:valueTo="0.65" /> @@ -39,13 +37,11 @@ android:propertyName="fillColor" android:valueFrom="#4285F4" android:valueTo="#000000" - android:valueType="intType" android:interpolator="@android:interpolator/fast_out_slow_in" /> + android:valueFrom="0.65" + android:valueTo="0.07" /> diff --git a/res/drawable-hdpi/dotted_line_480px.png b/res/drawable-hdpi/dotted_line_480px.png deleted file mode 100644 index 4c25bae3853..00000000000 Binary files a/res/drawable-hdpi/dotted_line_480px.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_accessibility_generic.png b/res/drawable-hdpi/ic_accessibility_generic.png deleted file mode 100644 index 22294094398..00000000000 Binary files a/res/drawable-hdpi/ic_accessibility_generic.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_refresh_holo_dark.png b/res/drawable-hdpi/ic_menu_refresh_holo_dark.png deleted file mode 100644 index 69ac31be312..00000000000 Binary files a/res/drawable-hdpi/ic_menu_refresh_holo_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_power_system.png b/res/drawable-hdpi/ic_power_system.png deleted file mode 100644 index 3592466263b..00000000000 Binary files a/res/drawable-hdpi/ic_power_system.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_settings_cell_standby.png b/res/drawable-hdpi/ic_settings_cell_standby.png deleted file mode 100644 index 7d51c80be12..00000000000 Binary files a/res/drawable-hdpi/ic_settings_cell_standby.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_settings_development_alpha.png b/res/drawable-hdpi/ic_settings_development_alpha.png deleted file mode 100644 index 44cfb57f75d..00000000000 Binary files a/res/drawable-hdpi/ic_settings_development_alpha.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png deleted file mode 100644 index 0a714167e56..00000000000 Binary files a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_settings_phone_idle.png b/res/drawable-hdpi/ic_settings_phone_idle.png deleted file mode 100644 index 6ae7f5ea9c4..00000000000 Binary files a/res/drawable-hdpi/ic_settings_phone_idle.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_settings_voice_calls.png b/res/drawable-hdpi/ic_settings_voice_calls.png deleted file mode 100644 index b3cefda5af1..00000000000 Binary files a/res/drawable-hdpi/ic_settings_voice_calls.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_sync_grey_holo.png b/res/drawable-hdpi/ic_sync_grey_holo.png deleted file mode 100644 index ff927e9372d..00000000000 Binary files a/res/drawable-hdpi/ic_sync_grey_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_sync_red_holo.png b/res/drawable-hdpi/ic_sync_red_holo.png deleted file mode 100644 index f7949ae5674..00000000000 Binary files a/res/drawable-hdpi/ic_sync_red_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_warning_googred_48dp.png b/res/drawable-hdpi/ic_warning_googred_48dp.png new file mode 100644 index 00000000000..70381dd06bb Binary files /dev/null and b/res/drawable-hdpi/ic_warning_googred_48dp.png differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png deleted file mode 100644 index d15333697cf..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png deleted file mode 100644 index 7ffbc8457e1..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png deleted file mode 100644 index 73ab082a223..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png deleted file mode 100644 index 3b4704902e2..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png deleted file mode 100644 index 8b055b08710..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png deleted file mode 100644 index 9514eae51a5..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png deleted file mode 100644 index b8a4fe77375..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png deleted file mode 100644 index ec697c8921f..00000000000 Binary files a/res/drawable-hdpi/ic_wifi_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/nav_divider.png b/res/drawable-hdpi/nav_divider.png deleted file mode 100644 index b1f035c93d9..00000000000 Binary files a/res/drawable-hdpi/nav_divider.png and /dev/null differ diff --git a/res/drawable-mdpi/dotted_line_480px.png b/res/drawable-mdpi/dotted_line_480px.png deleted file mode 100755 index a52ca4392ff..00000000000 Binary files a/res/drawable-mdpi/dotted_line_480px.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_accessibility_generic.png b/res/drawable-mdpi/ic_accessibility_generic.png deleted file mode 100644 index d59cda6235d..00000000000 Binary files a/res/drawable-mdpi/ic_accessibility_generic.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_refresh_holo_dark.png b/res/drawable-mdpi/ic_menu_refresh_holo_dark.png deleted file mode 100644 index f68aacf07ea..00000000000 Binary files a/res/drawable-mdpi/ic_menu_refresh_holo_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_power_system.png b/res/drawable-mdpi/ic_power_system.png deleted file mode 100644 index f9813d9a41e..00000000000 Binary files a/res/drawable-mdpi/ic_power_system.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_settings_cell_standby.png b/res/drawable-mdpi/ic_settings_cell_standby.png deleted file mode 100644 index c922222297a..00000000000 Binary files a/res/drawable-mdpi/ic_settings_cell_standby.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_settings_development_alpha.png b/res/drawable-mdpi/ic_settings_development_alpha.png deleted file mode 100644 index cdc3ffe5edf..00000000000 Binary files a/res/drawable-mdpi/ic_settings_development_alpha.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png deleted file mode 100644 index 1a66a300450..00000000000 Binary files a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_settings_phone_idle.png b/res/drawable-mdpi/ic_settings_phone_idle.png deleted file mode 100644 index 92b4b0a7b39..00000000000 Binary files a/res/drawable-mdpi/ic_settings_phone_idle.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_settings_voice_calls.png b/res/drawable-mdpi/ic_settings_voice_calls.png deleted file mode 100644 index 92772958376..00000000000 Binary files a/res/drawable-mdpi/ic_settings_voice_calls.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_sync_grey_holo.png b/res/drawable-mdpi/ic_sync_grey_holo.png deleted file mode 100644 index 822fa20b404..00000000000 Binary files a/res/drawable-mdpi/ic_sync_grey_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_sync_red_holo.png b/res/drawable-mdpi/ic_sync_red_holo.png deleted file mode 100644 index 2fd7ae1ff01..00000000000 Binary files a/res/drawable-mdpi/ic_sync_red_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png deleted file mode 100644 index 03738de6fbe..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png deleted file mode 100644 index b37d529db70..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png deleted file mode 100644 index d4561116697..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png deleted file mode 100644 index 435f76811a3..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png deleted file mode 100644 index 5e186b3fbd7..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png deleted file mode 100644 index eb0b29005cf..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png deleted file mode 100644 index 47afa46f543..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png deleted file mode 100644 index df5cbf54923..00000000000 Binary files a/res/drawable-mdpi/ic_wifi_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png deleted file mode 100644 index f7ed6dff8ec..00000000000 Binary files a/res/drawable-mdpi/nav_divider.png and /dev/null differ diff --git a/res/drawable-mdpi/nfc_how_it_works.png b/res/drawable-mdpi/nfc_how_it_works.png deleted file mode 100644 index 1dc272cee4c..00000000000 Binary files a/res/drawable-mdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-mdpi/tapandpay_emptystate.png b/res/drawable-mdpi/tapandpay_emptystate.png deleted file mode 100644 index 1c0eb7612e7..00000000000 Binary files a/res/drawable-mdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable-nodpi/nfc_detection_point.png b/res/drawable-nodpi/nfc_detection_point.png new file mode 100644 index 00000000000..1914264c087 Binary files /dev/null and b/res/drawable-nodpi/nfc_detection_point.png differ diff --git a/res/drawable-xhdpi/dotted_line_480px.png b/res/drawable-xhdpi/dotted_line_480px.png deleted file mode 100644 index 7a9d0241d1d..00000000000 Binary files a/res/drawable-xhdpi/dotted_line_480px.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_accessibility_generic.png b/res/drawable-xhdpi/ic_accessibility_generic.png deleted file mode 100644 index a4d4036e4fc..00000000000 Binary files a/res/drawable-xhdpi/ic_accessibility_generic.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png deleted file mode 100644 index 3db90ee847a..00000000000 Binary files a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_power_system.png b/res/drawable-xhdpi/ic_power_system.png deleted file mode 100644 index 86716168301..00000000000 Binary files a/res/drawable-xhdpi/ic_power_system.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_settings_cell_standby.png b/res/drawable-xhdpi/ic_settings_cell_standby.png deleted file mode 100644 index a02b5a22c08..00000000000 Binary files a/res/drawable-xhdpi/ic_settings_cell_standby.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_settings_development_alpha.png b/res/drawable-xhdpi/ic_settings_development_alpha.png deleted file mode 100644 index 3a4b3d9b06c..00000000000 Binary files a/res/drawable-xhdpi/ic_settings_development_alpha.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png deleted file mode 100644 index 9aa2fd2e605..00000000000 Binary files a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_settings_phone_idle.png b/res/drawable-xhdpi/ic_settings_phone_idle.png deleted file mode 100644 index 1f8bd65606d..00000000000 Binary files a/res/drawable-xhdpi/ic_settings_phone_idle.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_settings_voice_calls.png b/res/drawable-xhdpi/ic_settings_voice_calls.png deleted file mode 100644 index fac4916e2b9..00000000000 Binary files a/res/drawable-xhdpi/ic_settings_voice_calls.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_sync_grey_holo.png b/res/drawable-xhdpi/ic_sync_grey_holo.png deleted file mode 100644 index 9b4662c6f97..00000000000 Binary files a/res/drawable-xhdpi/ic_sync_grey_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_sync_red_holo.png b/res/drawable-xhdpi/ic_sync_red_holo.png deleted file mode 100644 index a9e2b8cd1c5..00000000000 Binary files a/res/drawable-xhdpi/ic_sync_red_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png deleted file mode 100644 index c9dde7bf8c1..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png deleted file mode 100644 index 4e8f631982d..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png deleted file mode 100644 index c50c727e1d8..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png deleted file mode 100644 index 7b3b9e57894..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png deleted file mode 100644 index 142db5b39e5..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png deleted file mode 100644 index 0c41ae08019..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png deleted file mode 100644 index 6f0d944c860..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png deleted file mode 100644 index 418d53c74da..00000000000 Binary files a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/nav_divider.png b/res/drawable-xhdpi/nav_divider.png deleted file mode 100644 index 00e3852d5b6..00000000000 Binary files a/res/drawable-xhdpi/nav_divider.png and /dev/null differ diff --git a/res/drawable-xhdpi/nfc_how_it_works.png b/res/drawable-xhdpi/nfc_how_it_works.png deleted file mode 100644 index e61d77fd020..00000000000 Binary files a/res/drawable-xhdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-xhdpi/tapandpay_emptystate.png b/res/drawable-xhdpi/tapandpay_emptystate.png deleted file mode 100644 index f7f436ba2e4..00000000000 Binary files a/res/drawable-xhdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_accessibility_generic.png b/res/drawable-xxhdpi/ic_accessibility_generic.png deleted file mode 100644 index 361f5d5b28a..00000000000 Binary files a/res/drawable-xxhdpi/ic_accessibility_generic.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_power_system.png b/res/drawable-xxhdpi/ic_power_system.png deleted file mode 100644 index 8d4979f7c22..00000000000 Binary files a/res/drawable-xxhdpi/ic_power_system.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_settings_cell_standby.png b/res/drawable-xxhdpi/ic_settings_cell_standby.png deleted file mode 100644 index 07d5c85757f..00000000000 Binary files a/res/drawable-xxhdpi/ic_settings_cell_standby.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_settings_development_alpha.png b/res/drawable-xxhdpi/ic_settings_development_alpha.png deleted file mode 100644 index fc230845397..00000000000 Binary files a/res/drawable-xxhdpi/ic_settings_development_alpha.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png deleted file mode 100644 index 6e0924897c4..00000000000 Binary files a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_settings_phone_idle.png b/res/drawable-xxhdpi/ic_settings_phone_idle.png deleted file mode 100644 index a6fe8681745..00000000000 Binary files a/res/drawable-xxhdpi/ic_settings_phone_idle.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_settings_voice_calls.png b/res/drawable-xxhdpi/ic_settings_voice_calls.png deleted file mode 100644 index 78e448369d1..00000000000 Binary files a/res/drawable-xxhdpi/ic_settings_voice_calls.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_sync_grey_holo.png b/res/drawable-xxhdpi/ic_sync_grey_holo.png deleted file mode 100644 index 3b933bea1cd..00000000000 Binary files a/res/drawable-xxhdpi/ic_sync_grey_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_sync_red_holo.png b/res/drawable-xxhdpi/ic_sync_red_holo.png deleted file mode 100644 index 9144709199c..00000000000 Binary files a/res/drawable-xxhdpi/ic_sync_red_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png deleted file mode 100644 index d862a5e0814..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png deleted file mode 100644 index 1f5e56361a0..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png deleted file mode 100644 index e02938b49fc..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png deleted file mode 100644 index b312c97744d..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png deleted file mode 100644 index 45adfbe9c58..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png deleted file mode 100644 index 711c1f7b819..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png deleted file mode 100644 index b8aef2d7676..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png deleted file mode 100644 index 6166fdc627f..00000000000 Binary files a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/nfc_how_it_works.png b/res/drawable-xxhdpi/nfc_how_it_works.png deleted file mode 100644 index 0c816bd52eb..00000000000 Binary files a/res/drawable-xxhdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-xxhdpi/tapandpay_emptystate.png b/res/drawable-xxhdpi/tapandpay_emptystate.png deleted file mode 100644 index 6e600227aba..00000000000 Binary files a/res/drawable-xxhdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_accessibility_generic.png b/res/drawable-xxxhdpi/ic_accessibility_generic.png deleted file mode 100644 index a960e794702..00000000000 Binary files a/res/drawable-xxxhdpi/ic_accessibility_generic.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_power_system.png b/res/drawable-xxxhdpi/ic_power_system.png deleted file mode 100644 index bc92e90875d..00000000000 Binary files a/res/drawable-xxxhdpi/ic_power_system.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_settings_cell_standby.png b/res/drawable-xxxhdpi/ic_settings_cell_standby.png deleted file mode 100644 index 3c864ce4f23..00000000000 Binary files a/res/drawable-xxxhdpi/ic_settings_cell_standby.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_settings_development_alpha.png b/res/drawable-xxxhdpi/ic_settings_development_alpha.png deleted file mode 100644 index 47f454791ce..00000000000 Binary files a/res/drawable-xxxhdpi/ic_settings_development_alpha.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png deleted file mode 100644 index 6c29a53c977..00000000000 Binary files a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_settings_phone_idle.png b/res/drawable-xxxhdpi/ic_settings_phone_idle.png deleted file mode 100644 index 4851676ebbf..00000000000 Binary files a/res/drawable-xxxhdpi/ic_settings_phone_idle.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_settings_voice_calls.png b/res/drawable-xxxhdpi/ic_settings_voice_calls.png deleted file mode 100644 index 633cfc1b914..00000000000 Binary files a/res/drawable-xxxhdpi/ic_settings_voice_calls.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_sync_grey_holo.png b/res/drawable-xxxhdpi/ic_sync_grey_holo.png deleted file mode 100644 index 7cff1029f11..00000000000 Binary files a/res/drawable-xxxhdpi/ic_sync_grey_holo.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_sync_red_holo.png b/res/drawable-xxxhdpi/ic_sync_red_holo.png deleted file mode 100644 index 115bb7aa478..00000000000 Binary files a/res/drawable-xxxhdpi/ic_sync_red_holo.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png deleted file mode 100644 index dfc176f8ea1..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_dark.png deleted file mode 100644 index 0386e0d86ad..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_dark.png deleted file mode 100644 index 7a9349f0c11..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_dark.png deleted file mode 100644 index aa2eb6d530e..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_dark.png deleted file mode 100644 index d8ba2872f26..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_1_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_dark.png deleted file mode 100644 index e700338b01b..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_2_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_dark.png deleted file mode 100644 index 8d3c4467172..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_3_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_dark.png deleted file mode 100644 index c11b797e5c8..00000000000 Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_4_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/nfc_how_it_works.png b/res/drawable-xxxhdpi/nfc_how_it_works.png deleted file mode 100644 index 0add50f7795..00000000000 Binary files a/res/drawable-xxxhdpi/nfc_how_it_works.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/tapandpay_emptystate.png b/res/drawable-xxxhdpi/tapandpay_emptystate.png deleted file mode 100644 index de8e437b1f8..00000000000 Binary files a/res/drawable-xxxhdpi/tapandpay_emptystate.png and /dev/null differ diff --git a/res/drawable/accessibility_captions.png b/res/drawable/accessibility_captions.png new file mode 100644 index 00000000000..718f4ef6dd8 Binary files /dev/null and b/res/drawable/accessibility_captions.png differ diff --git a/res/drawable/accessibility_color_inversion_banner.gif b/res/drawable/accessibility_color_inversion_banner.gif new file mode 100644 index 00000000000..dc7c8acc136 Binary files /dev/null and b/res/drawable/accessibility_color_inversion_banner.gif differ diff --git a/res/drawable/accessibility_dwell.png b/res/drawable/accessibility_dwell.png new file mode 100644 index 00000000000..b4f55987ca3 Binary files /dev/null and b/res/drawable/accessibility_dwell.png differ diff --git a/res/drawable/accessibility_magnification_banner.gif b/res/drawable/accessibility_magnification_banner.gif new file mode 100644 index 00000000000..f9b7e368ac5 Binary files /dev/null and b/res/drawable/accessibility_magnification_banner.gif differ diff --git a/res/drawable/accessibility_magnification_full_screen.png b/res/drawable/accessibility_magnification_full_screen.png new file mode 100644 index 00000000000..7fcd17d5cb5 Binary files /dev/null and b/res/drawable/accessibility_magnification_full_screen.png differ diff --git a/res/drawable/accessibility_magnification_window_screen.png b/res/drawable/accessibility_magnification_window_screen.png new file mode 100644 index 00000000000..db1f33274b1 Binary files /dev/null and b/res/drawable/accessibility_magnification_window_screen.png differ diff --git a/res/drawable/accessibility_screen_magnification_background.xml b/res/drawable/accessibility_screen_magnification_background.xml deleted file mode 100644 index e22cfece1df..00000000000 --- a/res/drawable/accessibility_screen_magnification_background.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - diff --git a/res/drawable/accessibility_shortcut_type_hardware.png b/res/drawable/accessibility_shortcut_type_hardware.png new file mode 100644 index 00000000000..664ceb368b7 Binary files /dev/null and b/res/drawable/accessibility_shortcut_type_hardware.png differ diff --git a/res/drawable/accessibility_shortcut_type_software.png b/res/drawable/accessibility_shortcut_type_software.png new file mode 100644 index 00000000000..0212548c8e9 Binary files /dev/null and b/res/drawable/accessibility_shortcut_type_software.png differ diff --git a/res/drawable/accessibility_shortcut_type_software_gesture.png b/res/drawable/accessibility_shortcut_type_software_gesture.png new file mode 100644 index 00000000000..0a2921a29c4 Binary files /dev/null and b/res/drawable/accessibility_shortcut_type_software_gesture.png differ diff --git a/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png b/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png new file mode 100644 index 00000000000..85fec85cc94 Binary files /dev/null and b/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png differ diff --git a/res/drawable/accessibility_shortcut_type_triple_tap.png b/res/drawable/accessibility_shortcut_type_triple_tap.png new file mode 100644 index 00000000000..6a08d29b2ee Binary files /dev/null and b/res/drawable/accessibility_shortcut_type_triple_tap.png differ diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml index 65dfe1b67a3..29acbcea8e1 100644 --- a/res/drawable/button_border_selected.xml +++ b/res/drawable/button_border_selected.xml @@ -20,6 +20,6 @@ android:color="@color/notification_importance_selection_bg" /> + android:color="?android:attr/colorAccent"/> diff --git a/res/drawable/ic_accessibility_generic.xml b/res/drawable/ic_accessibility_generic.xml new file mode 100644 index 00000000000..2c7d41301aa --- /dev/null +++ b/res/drawable/ic_accessibility_generic.xml @@ -0,0 +1,30 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_accessibility_new.xml b/res/drawable/ic_accessibility_new.xml index 6bfc6c60f92..265259cf587 100644 --- a/res/drawable/ic_accessibility_new.xml +++ b/res/drawable/ic_accessibility_new.xml @@ -15,10 +15,11 @@ --> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> diff --git a/res/drawable/ic_accessibility_page_indicator.xml b/res/drawable/ic_accessibility_page_indicator.xml new file mode 100644 index 00000000000..4fa8204c663 --- /dev/null +++ b/res/drawable/ic_accessibility_page_indicator.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_add_40dp.xml b/res/drawable/ic_add_40dp.xml new file mode 100644 index 00000000000..7245823749b --- /dev/null +++ b/res/drawable/ic_add_40dp.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_add_blue_24dp.xml b/res/drawable/ic_add_blue_24dp.xml new file mode 100644 index 00000000000..a9a2f607793 --- /dev/null +++ b/res/drawable/ic_add_blue_24dp.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_add_to_home.xml b/res/drawable/ic_add_to_home.xml new file mode 100644 index 00000000000..1f55b7194cb --- /dev/null +++ b/res/drawable/ic_add_to_home.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_analytics_grey.xml b/res/drawable/ic_analytics_grey.xml new file mode 100644 index 00000000000..f0bbdb93fc3 --- /dev/null +++ b/res/drawable/ic_analytics_grey.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml index 841c25a1e7b..8e9ba82eea0 100644 --- a/res/drawable/ic_apps.xml +++ b/res/drawable/ic_apps.xml @@ -25,5 +25,5 @@ 2zm4-8c0 1.1 .9 2 2 2s2-.9 2-2-.9-2-2-2-2 .9-2 2zm-4 2c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z" - android:fillColor="#FFFFFFFF"/> + android:fillColor="?android:attr/colorPrimary"/> diff --git a/res/drawable/ic_bluetooth_disabled.xml b/res/drawable/ic_bluetooth_disabled.xml new file mode 100644 index 00000000000..f48b5daefb3 --- /dev/null +++ b/res/drawable/ic_bluetooth_disabled.xml @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_bubble_all.xml b/res/drawable/ic_bubble_all.xml new file mode 100644 index 00000000000..fdcf6dc803c --- /dev/null +++ b/res/drawable/ic_bubble_all.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_bubble_none.xml b/res/drawable/ic_bubble_none.xml new file mode 100644 index 00000000000..e8fd7df3def --- /dev/null +++ b/res/drawable/ic_bubble_none.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_bubble_selected.xml b/res/drawable/ic_bubble_selected.xml new file mode 100644 index 00000000000..f9533283b5e --- /dev/null +++ b/res/drawable/ic_bubble_selected.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_check_box_anim.xml b/res/drawable/ic_check_box_anim.xml new file mode 100644 index 00000000000..f6aed8ff64a --- /dev/null +++ b/res/drawable/ic_check_box_anim.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/res/drawable/ic_check_box_blue_24dp.xml b/res/drawable/ic_check_box_blue_24dp.xml new file mode 100644 index 00000000000..43cae698398 --- /dev/null +++ b/res/drawable/ic_check_box_blue_24dp.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_check_box_outline_24dp.xml b/res/drawable/ic_check_box_outline_24dp.xml new file mode 100644 index 00000000000..f6f453af2a2 --- /dev/null +++ b/res/drawable/ic_check_box_outline_24dp.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml index 214d2cffc30..1c42607de85 100644 --- a/res/drawable/ic_check_circle_green.xml +++ b/res/drawable/ic_check_circle_green.xml @@ -15,8 +15,8 @@ --> + + + + + diff --git a/res/drawable/ic_create_bubble.xml b/res/drawable/ic_create_bubble.xml new file mode 100644 index 00000000000..82d5db81210 --- /dev/null +++ b/res/drawable/ic_create_bubble.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_delete_x.xml b/res/drawable/ic_delete_x.xml new file mode 100644 index 00000000000..345daf03fe6 --- /dev/null +++ b/res/drawable/ic_delete_x.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_demote_conversation.xml b/res/drawable/ic_demote_conversation.xml new file mode 100644 index 00000000000..ef25bad859a --- /dev/null +++ b/res/drawable/ic_demote_conversation.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_devices_check_circle_green.xml b/res/drawable/ic_devices_check_circle_green_32dp.xml similarity index 77% rename from res/drawable/ic_devices_check_circle_green.xml rename to res/drawable/ic_devices_check_circle_green_32dp.xml index 71c683b3021..b964b1565f5 100644 --- a/res/drawable/ic_devices_check_circle_green.xml +++ b/res/drawable/ic_devices_check_circle_green_32dp.xml @@ -16,15 +16,15 @@ diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index c7b6cf2ead2..5ef9f16dd5f 100644 --- a/res/drawable/ic_devices_other.xml +++ b/res/drawable/ic_devices_other.xml @@ -20,7 +20,7 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/res/drawable/ic_devices_other_opaque_black.xml b/res/drawable/ic_devices_other_32dp.xml similarity index 92% rename from res/drawable/ic_devices_other_opaque_black.xml rename to res/drawable/ic_devices_other_32dp.xml index 40cf527ae69..7f9df8c3088 100644 --- a/res/drawable/ic_devices_other_opaque_black.xml +++ b/res/drawable/ic_devices_other_32dp.xml @@ -14,9 +14,9 @@ limitations under the License. --> + + + + + diff --git a/res/drawable/ic_enterprise.xml b/res/drawable/ic_enterprise.xml new file mode 100644 index 00000000000..c2d9df61893 --- /dev/null +++ b/res/drawable/ic_enterprise.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml index f8bac71e877..c0afa14307c 100644 --- a/res/drawable/ic_help.xml +++ b/res/drawable/ic_help.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_help_outline_32.xml b/res/drawable/ic_help_outline_32.xml new file mode 100644 index 00000000000..ffe673eef46 --- /dev/null +++ b/res/drawable/ic_help_outline_32.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_history.xml b/res/drawable/ic_history.xml new file mode 100644 index 00000000000..c9f4524c78f --- /dev/null +++ b/res/drawable/ic_history.xml @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_homepage_night_display.xml b/res/drawable/ic_homepage_night_display.xml new file mode 100644 index 00000000000..bfd6269c37e --- /dev/null +++ b/res/drawable/ic_homepage_night_display.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_notification.xml b/res/drawable/ic_homepage_notification.xml new file mode 100644 index 00000000000..d8c8d6dcf3c --- /dev/null +++ b/res/drawable/ic_homepage_notification.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_important_outline.xml b/res/drawable/ic_important_outline.xml new file mode 100644 index 00000000000..7a628bb6543 --- /dev/null +++ b/res/drawable/ic_important_outline.xml @@ -0,0 +1,27 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_keyboard_arrow_down.xml b/res/drawable/ic_keyboard_arrow_down.xml new file mode 100644 index 00000000000..d72f3dfd78a --- /dev/null +++ b/res/drawable/ic_keyboard_arrow_down.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml index 094e0bd4a9c..c93f3aee574 100644 --- a/res/drawable/ic_local_phone_24_lib.xml +++ b/res/drawable/ic_local_phone_24_lib.xml @@ -16,11 +16,10 @@ - + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FF000000" + android:pathData="M7.22,4l0.67,2.69 -2.29,2.3C4.65,6.86 4.32,5.03 4.18,4h3.04m10.09,12.05l2.69,0.68v3.09c-1.03,-0.14 -2.88,-0.47 -5.02,-1.43l2.33,-2.34M7.61,2H3.08c-0.57,0 -1.04,0.48 -1,1.05 0.9,12.4 12.04,18.88 18.94,18.88 0.54,0 0.98,-0.45 0.98,-1v-4.59c0,-0.69 -0.47,-1.29 -1.14,-1.45l-3.35,-0.84c-0.44,-0.11 -1,-0.03 -1.42,0.39l-2.98,2.98a18.57,18.57 0,0 1,-6.55 -6.57L9.5,7.91c0.37,-0.37 0.52,-0.91 0.39,-1.42l-0.82,-3.35C8.9,2.47 8.3,2 7.61,2z"/> diff --git a/res/drawable/ic_lock_closed.xml b/res/drawable/ic_lock_closed.xml new file mode 100644 index 00000000000..cb0ea241246 --- /dev/null +++ b/res/drawable/ic_lock_closed.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/res/drawable/ic_mode_edit.xml b/res/drawable/ic_mode_edit.xml new file mode 100644 index 00000000000..60a0dd1ca15 --- /dev/null +++ b/res/drawable/ic_mode_edit.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_notification_alert.xml b/res/drawable/ic_notification_alert.xml index 927f7ccfc3c..c8efc7f4f16 100644 --- a/res/drawable/ic_notification_alert.xml +++ b/res/drawable/ic_notification_alert.xml @@ -14,28 +14,13 @@ Copyright (C) 2019 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/res/drawable/ic_notifications_alert.xml b/res/drawable/ic_notifications_alert.xml index 5a25459e353..5df6b4fcae5 100644 --- a/res/drawable/ic_notifications_alert.xml +++ b/res/drawable/ic_notifications_alert.xml @@ -14,10 +14,10 @@ Copyright (C) 2019 The Android Open Source Project limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/res/drawable/ic_notifications_white.xml b/res/drawable/ic_notifications_white.xml new file mode 100644 index 00000000000..1a37b56c062 --- /dev/null +++ b/res/drawable/ic_notifications_white.xml @@ -0,0 +1,19 @@ + + diff --git a/res/drawable/ic_pan_tool_18dp.xml b/res/drawable/ic_pan_tool_18dp.xml index 3ebfc9ce2c6..36b133b6677 100644 --- a/res/drawable/ic_pan_tool_18dp.xml +++ b/res/drawable/ic_pan_tool_18dp.xml @@ -1,10 +1,28 @@ + + + + android:width="18dp" + android:height="18dp" + android:viewportWidth="48" + android:viewportHeight="48"> - + diff --git a/res/drawable/ic_phone.xml b/res/drawable/ic_phone.xml new file mode 100644 index 00000000000..28f47fd3486 --- /dev/null +++ b/res/drawable/ic_phone.xml @@ -0,0 +1,29 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_phone_info.xml index 7aee3e86ebc..e0b64ee3c07 100644 --- a/res/drawable/ic_phone_info.xml +++ b/res/drawable/ic_phone_info.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_power_system.xml b/res/drawable/ic_power_system.xml new file mode 100644 index 00000000000..3b84f592221 --- /dev/null +++ b/res/drawable/ic_power_system.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/ic_promote_conversation.xml b/res/drawable/ic_promote_conversation.xml new file mode 100644 index 00000000000..170f2baaaac --- /dev/null +++ b/res/drawable/ic_promote_conversation.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_qrcode_32dp.xml b/res/drawable/ic_qrcode_32dp.xml new file mode 100644 index 00000000000..512d44e32b8 --- /dev/null +++ b/res/drawable/ic_qrcode_32dp.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_scan_32dp.xml b/res/drawable/ic_scan_32dp.xml new file mode 100644 index 00000000000..d1eda4f333d --- /dev/null +++ b/res/drawable/ic_scan_32dp.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml index d5c89b96fb3..0055a65d681 100644 --- a/res/drawable/ic_settings_accessibility.xml +++ b/res/drawable/ic_settings_accessibility.xml @@ -19,9 +19,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml index 7f182866d48..50dcf76a4bd 100644 --- a/res/drawable/ic_settings_accounts.xml +++ b/res/drawable/ic_settings_accounts.xml @@ -19,9 +19,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml index 255b75e7d9e..d1f91c5563c 100644 --- a/res/drawable/ic_settings_battery_white.xml +++ b/res/drawable/ic_settings_battery_white.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_cell_standby.xml b/res/drawable/ic_settings_cell_standby.xml new file mode 100644 index 00000000000..5a9a300f021 --- /dev/null +++ b/res/drawable/ic_settings_cell_standby.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res/drawable/ic_settings_close.xml b/res/drawable/ic_settings_close.xml index 058b4b5b2e3..141a2c34b7e 100644 --- a/res/drawable/ic_settings_close.xml +++ b/res/drawable/ic_settings_close.xml @@ -18,7 +18,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> diff --git a/res/drawable/ic_settings_development.xml b/res/drawable/ic_settings_development.xml index 211b3a2e2ed..a6577b425cc 100644 --- a/res/drawable/ic_settings_development.xml +++ b/res/drawable/ic_settings_development.xml @@ -15,7 +15,14 @@ limitations under the License. --> - - + + + diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml index 62dc21f305b..96be116f605 100644 --- a/res/drawable/ic_settings_display_white.xml +++ b/res/drawable/ic_settings_display_white.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml index b7cfd6f2386..e1156a909cc 100644 --- a/res/drawable/ic_settings_location.xml +++ b/res/drawable/ic_settings_location.xml @@ -19,9 +19,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml index 555a6b4f1d2..f7fb28845b5 100644 --- a/res/drawable/ic_settings_nfc_payment.xml +++ b/res/drawable/ic_settings_nfc_payment.xml @@ -14,9 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. --> + + + - diff --git a/res/drawable/ic_settings_night_display_white.xml b/res/drawable/ic_settings_night_display_white.xml new file mode 100644 index 00000000000..8424b31295c --- /dev/null +++ b/res/drawable/ic_settings_night_display_white.xml @@ -0,0 +1,19 @@ + + diff --git a/res/drawable/ic_settings_privacy.xml b/res/drawable/ic_settings_privacy.xml index fcad83ab33b..cdb2ac63fa0 100644 --- a/res/drawable/ic_settings_privacy.xml +++ b/res/drawable/ic_settings_privacy.xml @@ -20,12 +20,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml index 4e2b1ee8124..a90bb8f79f7 100644 --- a/res/drawable/ic_settings_security_white.xml +++ b/res/drawable/ic_settings_security_white.xml @@ -16,12 +16,9 @@ - - + android:viewportWidth="24" + android:viewportHeight="24"> + \ No newline at end of file diff --git a/res/drawable/ic_settings_sign_in.xml b/res/drawable/ic_settings_sign_in.xml index e2fa5d82d1c..5c055cf31fa 100644 --- a/res/drawable/ic_settings_sign_in.xml +++ b/res/drawable/ic_settings_sign_in.xml @@ -17,7 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/res/drawable/ic_settings_sync_disabled.xml b/res/drawable/ic_settings_sync_disabled.xml new file mode 100644 index 00000000000..7dd71c7f9e6 --- /dev/null +++ b/res/drawable/ic_settings_sync_disabled.xml @@ -0,0 +1,27 @@ + + + + + + diff --git a/res/drawable/ic_settings_sync_failed.xml b/res/drawable/ic_settings_sync_failed.xml new file mode 100644 index 00000000000..8cb128a67c7 --- /dev/null +++ b/res/drawable/ic_settings_sync_failed.xml @@ -0,0 +1,27 @@ + + + + + + diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml index 5a697d4ab21..cf3bb7b2330 100644 --- a/res/drawable/ic_settings_system_dashboard_white.xml +++ b/res/drawable/ic_settings_system_dashboard_white.xml @@ -19,12 +19,12 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_wireless_white.xml b/res/drawable/ic_settings_wireless_white.xml index 63be43b290b..c56aa7e1b5c 100644 --- a/res/drawable/ic_settings_wireless_white.xml +++ b/res/drawable/ic_settings_wireless_white.xml @@ -16,4 +16,4 @@ \ No newline at end of file + android:tint="?android:attr/colorPrimary" /> \ No newline at end of file diff --git a/res/drawable/ic_snooze.xml b/res/drawable/ic_snooze.xml new file mode 100644 index 00000000000..d7bbbaf42a7 --- /dev/null +++ b/res/drawable/ic_snooze.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_speaker_group_black_24dp.xml b/res/drawable/ic_speaker_group_black_24dp.xml new file mode 100644 index 00000000000..ae0d56217fd --- /dev/null +++ b/res/drawable/ic_speaker_group_black_24dp.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/res/drawable/ic_storage_grey.xml b/res/drawable/ic_storage_grey.xml new file mode 100644 index 00000000000..420aba831ff --- /dev/null +++ b/res/drawable/ic_storage_grey.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/res/drawable/ic_storage_white.xml b/res/drawable/ic_storage_white.xml index eed91406ec1..3b5d3c32c7e 100644 --- a/res/drawable/ic_storage_white.xml +++ b/res/drawable/ic_storage_white.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_swap.xml b/res/drawable/ic_swap.xml new file mode 100644 index 00000000000..1c43d974428 --- /dev/null +++ b/res/drawable/ic_swap.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_today.xml b/res/drawable/ic_today.xml new file mode 100644 index 00000000000..1d396104ce8 --- /dev/null +++ b/res/drawable/ic_today.xml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_visibility_18dp.xml b/res/drawable/ic_visibility_18dp.xml index 9e27815cb76..9dc269fe806 100644 --- a/res/drawable/ic_visibility_18dp.xml +++ b/res/drawable/ic_visibility_18dp.xml @@ -1,9 +1,26 @@ + + + - + android:width="18dp" + android:height="18dp" + android:viewportWidth="48" + android:viewportHeight="48"> + diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml index 8c68c0070f9..a1136d3ed08 100644 --- a/res/drawable/ic_volume_up_24dp.xml +++ b/res/drawable/ic_volume_up_24dp.xml @@ -20,12 +20,12 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_wifi_off.xml b/res/drawable/ic_wifi_off.xml new file mode 100644 index 00000000000..1480a59c3a7 --- /dev/null +++ b/res/drawable/ic_wifi_off.xml @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_wifi_signal_4_32dp.xml b/res/drawable/ic_wifi_signal_4_32dp.xml new file mode 100644 index 00000000000..64de14d3400 --- /dev/null +++ b/res/drawable/ic_wifi_signal_4_32dp.xml @@ -0,0 +1,22 @@ + + + diff --git a/res/drawable/nfc_how_it_works.xml b/res/drawable/nfc_how_it_works.xml new file mode 100644 index 00000000000..f2a6b61c2c3 --- /dev/null +++ b/res/drawable/nfc_how_it_works.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + diff --git a/res/drawable/rounded_bg.xml b/res/drawable/rounded_bg.xml new file mode 100644 index 00000000000..fcdd7614e64 --- /dev/null +++ b/res/drawable/rounded_bg.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/signal_strength_5g.xml b/res/drawable/signal_strength_5g.xml new file mode 100644 index 00000000000..dc89f9ad926 --- /dev/null +++ b/res/drawable/signal_strength_5g.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/tapandpay_emptystate.xml b/res/drawable/tapandpay_emptystate.xml new file mode 100644 index 00000000000..8d623e870b5 --- /dev/null +++ b/res/drawable/tapandpay_emptystate.xml @@ -0,0 +1,34 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/tile_icon_debugging_wireless.xml b/res/drawable/tile_icon_debugging_wireless.xml new file mode 100644 index 00000000000..4f0f56c679c --- /dev/null +++ b/res/drawable/tile_icon_debugging_wireless.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/res/drawable/tile_icon_sensors_off.xml b/res/drawable/tile_icon_sensors_off.xml index 890fa839717..b9b3500593a 100644 --- a/res/drawable/tile_icon_sensors_off.xml +++ b/res/drawable/tile_icon_sensors_off.xml @@ -18,7 +18,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + + + + + + + + + + + + + diff --git a/res/drawable/zen_calls_contacts.xml b/res/drawable/zen_calls_contacts.xml new file mode 100644 index 00000000000..a4c064a76e5 --- /dev/null +++ b/res/drawable/zen_calls_contacts.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/zen_calls_none.xml b/res/drawable/zen_calls_none.xml new file mode 100644 index 00000000000..e89da49d7b6 --- /dev/null +++ b/res/drawable/zen_calls_none.xml @@ -0,0 +1,39 @@ + + + + + + + + + diff --git a/res/drawable/zen_calls_starred.xml b/res/drawable/zen_calls_starred.xml new file mode 100644 index 00000000000..25e9a6193eb --- /dev/null +++ b/res/drawable/zen_calls_starred.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/zen_messages_any.xml b/res/drawable/zen_messages_any.xml new file mode 100644 index 00000000000..edeaea2726c --- /dev/null +++ b/res/drawable/zen_messages_any.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + diff --git a/res/drawable/zen_messages_contacts.xml b/res/drawable/zen_messages_contacts.xml new file mode 100644 index 00000000000..8da80b94a0b --- /dev/null +++ b/res/drawable/zen_messages_contacts.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/zen_messages_none.xml b/res/drawable/zen_messages_none.xml new file mode 100644 index 00000000000..c72cc4f133c --- /dev/null +++ b/res/drawable/zen_messages_none.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/res/drawable/zen_messages_starred.xml b/res/drawable/zen_messages_starred.xml new file mode 100644 index 00000000000..75feb80d711 --- /dev/null +++ b/res/drawable/zen_messages_starred.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml index 331d4a49601..df40ed48156 100644 --- a/res/layout-land/choose_lock_pattern.xml +++ b/res/layout-land/choose_lock_pattern.xml @@ -43,27 +43,27 @@ android:clipToPadding="false" android:orientation="vertical"> - - + android:layout_weight="1"> + + + +