diff --git a/Android.bp b/Android.bp index 3cf1034010f22df29e0eaa8a5a1ee03d85b8ee61..619a390d8b85e2aaaa67a4ed77c80c72509c56fc 100644 --- a/Android.bp +++ b/Android.bp @@ -44,7 +44,7 @@ android_library { "SettingsLib-search-defaults", ], - srcs: ["src/**/*.java"], + srcs: ["src/**/*.java", "src/**/*.kt"], static_libs: [ "androidx-constraintlayout_constraintlayout", @@ -56,10 +56,10 @@ android_library { "androidx.cardview_cardview", "androidx.preference_preference", "androidx.recyclerview_recyclerview", + "androidx.window_window", "com.google.android.material_material", "setupcompat", "setupdesign", - "androidx-constraintlayout_constraintlayout-solver", "androidx.lifecycle_lifecycle-runtime", "androidx.lifecycle_lifecycle-extensions", "guava", @@ -67,6 +67,7 @@ android_library { "net-utils-framework-common", "settings-contextual-card-protos-lite", "settings-log-bridge-protos-lite", + "settings-telephony-protos-lite", "contextualcards", "settings-logtags", "statslog-settings", @@ -74,7 +75,8 @@ android_library { "android.hardware.dumpstate-V1.0-java", "android.hardware.dumpstate-V1.1-java", "lottie", - "windowExtLib", + "WifiTrackerLib", + "SettingsLibActivityEmbedding", ], libs: [ @@ -103,10 +105,6 @@ android_app { ], static_libs: ["Settings-core"], uses_libs: ["org.apache.http.legacy"], - optional_uses_libs: [ - "androidx.window.extensions", - "androidx.window.sidecar", - ], resource_dirs: [], optimize: { proguard_flags_files: ["proguard.flags"], @@ -118,11 +116,6 @@ android_library_import { aars: ["libs/contextualcards.aar"], } -android_library_import { - name: "windowExtLib", - aars: ["libs/window_ext_lib.aar"], -} - filegroup { name: "Settings_proguard_flags", srcs: ["proguard.flags"], diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9885e5613f7fef4c1bca40e83a9cc552f3dc1e2b..a8e0390d4d828d83fd4b8db16a461e0f130cd64f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,16 +1,17 @@ + package="com.android.settings" + coreApp="true" + android:sharedUserId="android.uid.system"> - + - + + + @@ -83,6 +84,7 @@ + @@ -110,6 +112,12 @@ + + + + + + - - - + + android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"> @@ -148,12 +154,11 @@ @@ -163,14 +168,14 @@ android:value="true" /> - + android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"> @@ -199,7 +204,9 @@ + android:exported="false" + android:theme="@style/Theme.SubSettings" + android:taskAffinity="com.android.settings.root" /> - - + + + + @@ -404,13 +411,13 @@ android:value="com.android.settings.wifi.details.WifiNetworkDetailsFragment" /> - @@ -541,7 +548,6 @@ @@ -617,6 +623,17 @@ android:value="@string/menu_key_security"/> + + + + + + android:exported="false" + android:taskAffinity="com.android.settings.root"> + android:icon="@drawable/ic_homepage_wifi_tethering"> @@ -763,7 +781,7 @@ android:name="Settings$VpnSettingsActivity" android:label="@string/vpn_settings_title" android:exported="true" - android:icon="@drawable/ic_settings_wireless"> + android:icon="@drawable/ic_homepage_vpn"> @@ -847,6 +865,18 @@ android:theme="@style/Theme.LocalePickerWithRegionActivity"> + + + + + + + + + + @@ -1678,6 +1712,19 @@ android:value="true" /> + + + + + + + + + + + + @@ -1745,6 +1796,25 @@ android:value="true" /> + + + + + + + + + + + + @@ -1806,7 +1876,7 @@ android:exported="true" android:clearTaskOnLaunch="true" android:theme="@style/Theme.Settings.NoActionBar"> - + @@ -1911,8 +1981,7 @@ + android:exported="true"> @@ -1929,7 +1998,6 @@ android:targetActivity=".accessibility.AccessibilitySettingsForSetupWizardActivity"> - @@ -1939,10 +2007,28 @@ android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" /> - + + + + + + + + + + + + android:exported="true" + android:screenOrientation="portrait"> + + @@ -2154,6 +2245,7 @@ @@ -2161,7 +2253,9 @@ - + @@ -2175,6 +2269,11 @@ + + @@ -2758,7 +2857,7 @@ android:name="Settings$BatterySaverSettingsActivity" android:label="@string/battery_saver" android:exported="true" - android:icon="@drawable/ic_settings_battery"> + android:icon="@drawable/ic_homepage_battery"> @@ -2773,6 +2872,7 @@ @@ -2841,7 +2941,8 @@ android:screenOrientation="nosensor" android:taskAffinity="com.android.settings.FallbackHome" android:exported="true" - android:theme="@style/FallbackHome"> + android:theme="@style/FallbackHome" + android:configChanges="keyboardHidden"> @@ -2853,7 +2954,7 @@ android:name="Settings$DataUsageSummaryActivity" android:label="@string/data_usage_summary_title" android:exported="true" - android:icon="@drawable/ic_settings_data_usage"> + android:icon="@drawable/ic_homepage_data_usage"> @@ -2925,6 +3026,13 @@ android:value="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3335,6 +3477,10 @@ + + + + + + + + + android:enabled="@*android:bool/config_settingsHelpLinksEnabled" /> + android:value="com.android.settings.bluetooth.BluetoothBroadcastDialog" /> @@ -4177,9 +4335,28 @@ android:value="true" /> + + + + + + + + + + + + + + android:label="@string/media_controls_title"> @@ -4227,6 +4404,7 @@ android:name=".sim.ChooseSimActivity" android:theme="@style/GlifV3Theme.DayNight.NoActionBar" android:launchMode="singleInstance" + android:excludeFromRecents="true" android:exported="false"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 26aeba3acff47fc0a8a8c35b5714cb4ed13bfbb3..edd2d59be964129aebd816d3893631b6d66e3102 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -85,11 +85,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=" <color name="homepage_accessibility_background">#783BE5</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="divider_color">#20ffffff</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -101,11 +101,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=" <color name="homepage_support_background">#3F5FBD</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="homepage_accessibility_background">#783BE5</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -117,11 +117,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=" <color name="divider_color">#20ffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="homepage_support_background">#3F5FBD</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -133,11 +133,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=" <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="setup_wizard_wifi_color_dark">#89ffffff</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -149,11 +149,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=" <color name="setup_wizard_wifi_color_dark">#89ffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="setup_wizard_wifi_color_light">#89000000</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -165,11 +165,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=" <color name="notification_importance_button_unselected">#5F6368</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="lock_pattern_background">#00000000</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -181,11 +181,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=" <color name="setup_wizard_wifi_color_light">#89000000</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -197,11 +197,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=" <color name="notification_history_background">#202124</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="notification_importance_button_unselected">#5F6368</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -213,11 +213,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=" <color name="lock_pattern_background">#00000000</color>" + errorLine1=" <color name="fingerprint_title_color">#ffffffff</color>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -229,11 +229,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=" <color name="fingerprint_title_color">#ffffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="notification_history_background">#202124</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -249,7 +249,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -265,7 +265,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -281,7 +281,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -297,7 +297,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -313,7 +313,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -325,11 +325,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=" <color name="settings_dialog_colorError">#f28b82</color> <!-- Red 300 -->" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="material_blue_500">#4285F4</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -341,11 +341,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=" <color name="material_blue_500">#4285F4</color>" + errorLine1=" <color name="material_blue_700">#3367D6</color>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -357,11 +357,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=" <color name="biometric_enroll_intro_color_bar">#5bb974</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="material_grey_100">#f5f5f5</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -373,11 +373,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=" <color name="material_blue_700">#3367D6</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="settings_dialog_colorError">#f28b82</color> <!-- Red 300 -->" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -389,11 +389,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=" <color name="biometric_enroll_intro_color_icon">#669df6</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="material_grey_200">#ffffff</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -405,11 +405,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=" <color name="material_grey_100">#f5f5f5</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="message_text_incoming">#E4E3DA</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -421,11 +421,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=" <color name="biometric_enroll_intro_color_outline">#5e5e5e</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="biometric_enroll_intro_color_bar">#5bb974</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -437,11 +437,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=" <color name="material_grey_200">#ffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="message_text_outgoing">#1B1C17</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -453,11 +453,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=" <color name="fingerprint_enrollment_finish_color_outline">#669df6</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="biometric_enroll_intro_color_icon">#669df6</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -469,11 +469,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=" <color name="message_text_incoming">#ffffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="timestamp_text_outgoing">#99323232</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -485,11 +485,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=" <color name="message_text_outgoing">#ff323232</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="biometric_enroll_intro_color_outline">#5e5e5e</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -501,11 +501,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=" <color name="timestamp_text_outgoing">#99323232</color>" + errorLine1=" <color name="timestamp_text_incoming">#99ffffff</color>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -517,11 +517,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=" <color name="timestamp_text_incoming">#99ffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="fingerprint_enrollment_finish_color_outline">#669df6</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -533,11 +533,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=" <color name="message_bubble_incoming">#689f38</color>" + errorLine1=" <color name="message_bubble_incoming">#52534D</color>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -549,11 +549,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=" <color name="message_bubble_outgoing">#ffffffff</color>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <color name="message_bubble_outgoing">#C7C8B7</color>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -565,11 +565,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=" <color name="message_icon_background_incoming">#689f38</color>" + errorLine1=" <color name="message_icon_background_incoming">#E6F451</color>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -585,7 +585,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -597,11 +597,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=" <color name="message_icon_background_outgoing">#4285f4</color>" + errorLine1=" <color name="message_icon_background_outgoing">#FBBC04</color>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -617,7 +617,23 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + + + + @@ -633,7 +649,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -649,7 +665,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -665,7 +681,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -681,7 +697,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -697,7 +713,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -713,7 +729,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -729,7 +745,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -745,7 +761,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -761,7 +777,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -777,7 +793,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -793,7 +809,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -809,7 +825,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -825,7 +841,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -841,7 +857,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -857,7 +873,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -873,7 +889,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -889,7 +905,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -905,7 +921,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -921,7 +937,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -937,7 +953,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -953,7 +969,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -969,7 +985,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -985,7 +1001,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1001,7 +1017,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1017,7 +1033,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1033,7 +1049,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1049,7 +1065,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1065,7 +1081,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1081,7 +1097,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1097,7 +1113,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1113,7 +1129,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1129,7 +1145,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1145,7 +1161,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1161,7 +1177,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1177,7 +1193,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1193,7 +1209,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1209,7 +1225,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1225,7 +1241,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1241,7 +1257,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1257,7 +1273,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1273,7 +1289,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1289,7 +1305,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1305,7 +1321,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1321,7 +1337,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1337,7 +1353,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1353,7 +1369,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1369,7 +1385,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1385,7 +1401,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1401,7 +1417,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1417,7 +1433,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1433,7 +1449,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1449,7 +1465,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1465,7 +1481,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1481,7 +1497,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1497,7 +1513,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1513,7 +1529,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1529,7 +1545,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1545,7 +1561,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1561,7 +1577,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1577,7 +1593,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1593,7 +1609,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1609,7 +1625,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1625,7 +1641,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1641,7 +1657,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1657,7 +1673,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1673,7 +1689,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1689,7 +1705,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1705,7 +1721,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1721,7 +1737,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1737,7 +1753,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1753,7 +1769,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1769,7 +1785,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1785,7 +1801,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1801,7 +1817,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1817,7 +1833,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1833,7 +1849,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1849,7 +1865,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1865,7 +1881,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1881,7 +1897,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1897,7 +1913,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1913,7 +1929,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1929,7 +1945,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1945,7 +1961,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1961,7 +1977,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1977,7 +1993,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1993,7 +2009,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2009,7 +2025,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2025,7 +2041,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2041,7 +2057,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2057,7 +2073,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2077,6 +2093,22 @@ column="8"/> + + + + - - - - @@ -2837,28 +2853,12 @@ 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=" android:fillColor="@color/battery_good_color_light"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" android:color="@color/accessibility_magnification_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - + column="13"/> @@ -2885,10 +2885,10 @@ 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=" android:color="@color/accessibility_color_inversion_background"/>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" android:color="@color/accessibility_feature_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -2901,12 +2901,12 @@ 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=" android:color="@color/accessibility_daltonizer_background"/>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + errorLine1=" android:color="@color/accessibility_feature_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + column="13"/> + errorLine1=" android:fillColor="@color/battery_good_color_light"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + column="9"/> + errorLine1=" android:fillColor="@color/battery_good_color_light"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="res/drawable/ic_battery_status_good_24dp.xml" + line="25" + column="9"/> + errorLine1=" android:color="@color/accessibility_feature_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="res/drawable/ic_captioning.xml" + line="22" + column="13"/> + errorLine1=" android:color="@color/accessibility_feature_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="res/drawable/ic_color_and_motion.xml" + line="22" + column="13"/> + errorLine1=" android:color="@color/accessibility_color_inversion_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="res/drawable/ic_color_inversion.xml" + line="22" + column="13"/> + errorLine1=" android:color="@color/accessibility_daltonizer_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="res/drawable/ic_daltonizer.xml" + line="22" + column="9"/> + errorLine1=" android:color="@color/accessibility_feature_background"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="res/drawable/ic_dark_ui.xml" + line="22" + column="13"/> + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - @@ -4377,39 +4345,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - @@ -4469,12 +4405,12 @@ 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="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=" ~~~~~~~~~~~~~~~~~~~"> + errorLine1=" <string name="sync_plug" msgid="7956982719077985381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎"<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=" ~~~~~~~~~~~~~~~~~~~"> + file="res/values-en-rXC/strings.xml" + line="3152" + column="170"/> @@ -4504,8 +4440,8 @@ 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=" ~~~~~~~~~~~~~~~~~~~"> @@ -4520,8 +4456,8 @@ 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=" ~~~~~~~~~~~~~~~~~~~"> @@ -4533,12 +4469,12 @@ 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="7956982719077985381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎"<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=" ~~~~~~~~~~~~~~~~~~~"> + 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=" ~~~~~~~~~~~~~~~~~~~"> + file="res/values-en-rIN/strings.xml" + line="3157" + column="64"/> - - - - @@ -4601,7 +4521,7 @@ errorLine2=" ^"> @@ -4649,7 +4569,7 @@ errorLine2=" ^"> @@ -4665,7 +4585,7 @@ errorLine2=" ^"> @@ -4681,7 +4601,7 @@ errorLine2=" ^"> @@ -4697,7 +4617,7 @@ errorLine2=" ^"> @@ -4713,7 +4633,7 @@ errorLine2=" ^"> @@ -4729,7 +4649,7 @@ errorLine2=" ^"> diff --git a/libs/window_ext_lib.aar b/libs/window_ext_lib.aar deleted file mode 100644 index ca58b362099b162d21e5ab9c0737dacfac66be17..0000000000000000000000000000000000000000 Binary files a/libs/window_ext_lib.aar and /dev/null differ diff --git a/proguard.flags b/proguard.flags index 3ed713636bd58e5a37a9eed42658b1770a0263b5..5482f1c52d0431d8065f8c9c870756b4e9fbd96d 100644 --- a/proguard.flags +++ b/proguard.flags @@ -68,5 +68,6 @@ } # Keep WM Jetpack classes and callbacks --keep class androidx.window.** { *; } +-keep class androidx.window.extensions.** { *; } -dontwarn androidx.window.extensions.** +-keep class androidx.window.** { *; } diff --git a/protos/Android.bp b/protos/Android.bp index e09b941924d2930c55f00223080ae7f36e7b9824..fbcf645307bbe13db101fc732768df82294e90bf 100644 --- a/protos/Android.bp +++ b/protos/Android.bp @@ -24,3 +24,12 @@ java_library_static { }, srcs: ["settings_log_bridge.proto"], } + +java_library_static { + name: "settings-telephony-protos-lite", + host_supported: true, + proto: { + type: "lite", + }, + srcs: ["network_mode_choices.proto"], +} diff --git a/protos/network_mode_choices.proto b/protos/network_mode_choices.proto new file mode 100644 index 0000000000000000000000000000000000000000..8c3ec931deca3a518a9975c0203ca230b3cf3dc5 --- /dev/null +++ b/protos/network_mode_choices.proto @@ -0,0 +1,112 @@ +syntax = "proto2"; + +package com.android.settings.intelligence; +option java_multiple_files = false; +option java_package = "com.android.settings.network.telephony"; +option java_outer_classname = "NetworkModeChoicesProto"; + +// EnabledNetworks is a list which tries to categorized the entries of popup menu +// based on carrier network types available to the end user. + +// Next tag: 13 +enum EnabledNetworks { + // No EnabledNetworks specified. + ENABLED_NETWORKS_UNSPECIFIED = 0; + + // For the case where either unsupported or unable to categorized properly. + ENABLED_NETWORKS_UNKNOWN = 1; + + // For the case where CDMA is supported and LTE is not prioritized over + // CDMA. + ENABLED_NETWORKS_CDMA_CHOICES = 2; + + // For the case where CDMA is supported and LTE is not available. + ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES = 3; + + // For the case where CDMA is supported and LTE is available. + ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES = 4; + + // For the case where TDSCDMA is primary network type. + ENABLED_NETWORKS_TDSCDMA_CHOICES = 5; + + // For the case where GSM and LTE options are removed from the menu. + ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES = 6; + + // For the case where GSM and 4G options are removed from the menu. + ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES = 7; + + // For the case where GSM is removed from the menu, and both 4G/LTE are not an + // option. + ENABLED_NETWORKS_EXCEPT_GSM_CHOICES = 8; + + // For the case where LTE is disabled. + ENABLED_NETWORKS_EXCEPT_LTE_CHOICES = 9; + + // For the case where GSM related carrier with 4G/LTE supported. + ENABLED_NETWORKS_4G_CHOICES = 10; + + // For the case where GSM related carrier without 4G/LTE supported. + ENABLED_NETWORKS_CHOICES = 11; + + // For the case where world mode is enabled. + PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE = 12; +} + +// A request for popup menu. + +// Next tag: 4 +message UiOptions { + // Mapping to popup menu categories. + required EnabledNetworks type = 1; + + // Resource which provides a list of network type values for this popup menu. + required int32 choices = 2; + + // Presentation format of a continuous popop menu entries. + // Each format may contains any numbers of popop menu entries. + + // Next tag: 12 + enum PresentFormat { + + // No PresentFormat specified. + PRESENT_FORMAT_UNSPECIFIED = 0; + + // Append a CDMA 1x network option into popup menu. + add1xEntry = 1; + + // Append a 2G network option into popup menu. + add2gEntry = 2; + + // Append a 3G network option into popup menu. + add3gEntry = 3; + + // Append a global mode option into popup menu. + addGlobalEntry = 4; + + // Append a CDMA/LTE global mode option into popup menu. + addWorldModeCdmaEntry = 5; + + // Append a GSM/LTE global mode option into popup menu. + addWorldModeGsmEntry = 6; + + // Append a 4G network option into popup menu. + add4gEntry = 7; + + // Append a LTE network option into popup menu. + addLteEntry = 8; + + // Append a 5G network option into popup menu. + add5gEntry = 9; + + // Append both 5G and 4G network options into popup menu. + add5gAnd4gEntry = 10; + + // Append both 5G and LTE network options into popup menu. + add5gAndLteEntry = 11; + } + + // Format of popup menu entries. + // The length of this entry need to be less than the network type values + // referenced from "choices" field. + repeated PresentFormat format = 3; +} diff --git a/res/color-night/accent_select_primary_text.xml b/res/color-night/accent_select_primary_text.xml new file mode 100644 index 0000000000000000000000000000000000000000..049ddf63678e695a2454ae6d4f10178b87474bdf --- /dev/null +++ b/res/color-night/accent_select_primary_text.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/color-night/accent_select_secondary_text.xml b/res/color-night/accent_select_secondary_text.xml new file mode 100644 index 0000000000000000000000000000000000000000..6b7b4f27dcf398cc6de8bc48111f33897bfad097 --- /dev/null +++ b/res/color-night/accent_select_secondary_text.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/color-night/settings_two_pane_background_color.xml b/res/color-night/settings_two_pane_background_color.xml new file mode 100644 index 0000000000000000000000000000000000000000..86aa0ed1855d56e1a0f06164971c3606137f617d --- /dev/null +++ b/res/color-night/settings_two_pane_background_color.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/color/accent_select_background.xml b/res/color/accent_select_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..5dab7230532b2cb6592b05e654c3ae38cf7ffffd --- /dev/null +++ b/res/color/accent_select_background.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/color/accent_select_primary_text.xml b/res/color/accent_select_primary_text.xml new file mode 100644 index 0000000000000000000000000000000000000000..f790d425a1a57627300eeec5a91b29c4cb5090f9 --- /dev/null +++ b/res/color/accent_select_primary_text.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/color/accent_select_secondary_text.xml b/res/color/accent_select_secondary_text.xml new file mode 100644 index 0000000000000000000000000000000000000000..25d24a8cdac17c7c3ff41047a3b85c0adad32c44 --- /dev/null +++ b/res/color/accent_select_secondary_text.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/color/dream_card_color_state_list.xml b/res/color/dream_card_color_state_list.xml new file mode 100644 index 0000000000000000000000000000000000000000..b0c86bba12190686eec415f99ff9100497611a39 --- /dev/null +++ b/res/color/dream_card_color_state_list.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/res/color/dream_card_icon_color_state_list.xml b/res/color/dream_card_icon_color_state_list.xml new file mode 100644 index 0000000000000000000000000000000000000000..c2e32cba34b77c15279d6af0eaae7adddb40fccd --- /dev/null +++ b/res/color/dream_card_icon_color_state_list.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/res/color/dream_card_text_color_state_list.xml b/res/color/dream_card_text_color_state_list.xml new file mode 100644 index 0000000000000000000000000000000000000000..438855fd233c8e7ac0862b24d6ba13024b60c9f4 --- /dev/null +++ b/res/color/dream_card_text_color_state_list.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/res/color/settings_two_pane_background_color.xml b/res/color/settings_two_pane_background_color.xml new file mode 100644 index 0000000000000000000000000000000000000000..6cb8e70307795fa49580204af248475170581ff8 --- /dev/null +++ b/res/color/settings_two_pane_background_color.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/accessibility_auto_added_qs_tooltip_illustration.xml b/res/drawable/accessibility_auto_added_qs_tooltip_illustration.xml new file mode 100644 index 0000000000000000000000000000000000000000..64245f111eff35c6aac088cf698dfe7d2c7a1b8a --- /dev/null +++ b/res/drawable/accessibility_auto_added_qs_tooltip_illustration.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + diff --git a/res/drawable/accessibility_qs_tooltip_background.xml b/res/drawable/accessibility_qs_tooltip_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..bfce47fa1129cce6b776b42a1b081608fadc3f15 --- /dev/null +++ b/res/drawable/accessibility_qs_tooltip_background.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/accessibility_qs_tooltip_illustration.xml b/res/drawable/accessibility_qs_tooltip_illustration.xml new file mode 100644 index 0000000000000000000000000000000000000000..2583b6f32bca30c1de72acc9b003eb72548cb66d --- /dev/null +++ b/res/drawable/accessibility_qs_tooltip_illustration.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + diff --git a/res/drawable/accessibility_text_reading_preview.xml b/res/drawable/accessibility_text_reading_preview.xml new file mode 100644 index 0000000000000000000000000000000000000000..54f3a428915f3c3cf26342288a0c90fa8bf5370f --- /dev/null +++ b/res/drawable/accessibility_text_reading_preview.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/res/drawable/bluetooth_broadcast_dialog_done.xml b/res/drawable/bluetooth_broadcast_dialog_done.xml new file mode 100644 index 0000000000000000000000000000000000000000..b2a5cc626819409bcfca1f074a66509b66881b32 --- /dev/null +++ b/res/drawable/bluetooth_broadcast_dialog_done.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/drawable/conversation_message_text_info_view_background.xml b/res/drawable/conversation_message_text_info_view_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..1d82f38251ab859ceab478690d2635c255d3ef73 --- /dev/null +++ b/res/drawable/conversation_message_text_info_view_background.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/res/drawable/dream_default_preview_icon.xml b/res/drawable/dream_default_preview_icon.xml new file mode 100644 index 0000000000000000000000000000000000000000..7d247bb2957ac61bab1a4ec821d943b104c1745d --- /dev/null +++ b/res/drawable/dream_default_preview_icon.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/dream_preview_icon.xml b/res/drawable/dream_preview_icon.xml new file mode 100644 index 0000000000000000000000000000000000000000..c4bd73936a16a7d7ddace3262c1f02a00d0b6cfd --- /dev/null +++ b/res/drawable/dream_preview_icon.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/dream_preview_rounded_bg.xml b/res/drawable/dream_preview_rounded_bg.xml new file mode 100644 index 0000000000000000000000000000000000000000..4da0c7c1a751e049529025e60410fc34a206272d --- /dev/null +++ b/res/drawable/dream_preview_rounded_bg.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/homepage_app_bar_background.xml b/res/drawable/homepage_app_bar_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..6872ab77a6f3c67530d3ac9daffc2a2e52c5b0ba --- /dev/null +++ b/res/drawable/homepage_app_bar_background.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/homepage_highlighted_item_background.xml b/res/drawable/homepage_highlighted_item_background.xml index b7b24e991a16a70eb2a78b8b546d717072a96c61..4656a46aa5c24885f2774e261145795df535c67c 100644 --- a/res/drawable/homepage_highlighted_item_background.xml +++ b/res/drawable/homepage_highlighted_item_background.xml @@ -14,13 +14,14 @@ 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/homepage_selectable_item_background.xml b/res/drawable/homepage_selectable_item_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..f5e17ea69b7bc9c05574d582aab912e33591ea89 --- /dev/null +++ b/res/drawable/homepage_selectable_item_background.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/res/drawable/ic_accessibility_animation.xml b/res/drawable/ic_accessibility_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..13bc4a264dcb0f24263edc4ae9a52566a5bea06a --- /dev/null +++ b/res/drawable/ic_accessibility_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_adaptive_font_download.xml b/res/drawable/ic_adaptive_font_download.xml new file mode 100644 index 0000000000000000000000000000000000000000..5b6eaeb96f18cf75ff36f85614181d2c18458369 --- /dev/null +++ b/res/drawable/ic_adaptive_font_download.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml index 20583a16f736ce9ef0fb2a32a71f03b5fb8da8f8..76ba829f5dbae958b2c20a0a4fd8e6f8bdb4028d 100644 --- a/res/drawable/ic_apps.xml +++ b/res/drawable/ic_apps.xml @@ -17,7 +17,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_text_and_display.xml b/res/drawable/ic_color_and_motion.xml similarity index 100% rename from res/drawable/ic_text_and_display.xml rename to res/drawable/ic_color_and_motion.xml diff --git a/res/drawable/ic_dream_check_circle.xml b/res/drawable/ic_dream_check_circle.xml new file mode 100644 index 0000000000000000000000000000000000000000..820615d260dc21beb9ef82a4cc3bd41e123a4f54 --- /dev/null +++ b/res/drawable/ic_dream_check_circle.xml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_files_go_round.xml b/res/drawable/ic_files_go_round.xml deleted file mode 100644 index 2025b000ea85b8173dea869ee6b475b4a861064a..0000000000000000000000000000000000000000 --- a/res/drawable/ic_files_go_round.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/drawable/ic_font_download.xml b/res/drawable/ic_font_download.xml new file mode 100644 index 0000000000000000000000000000000000000000..16366e99b3f8e382524b80e6d9b5891e8a00ba93 --- /dev/null +++ b/res/drawable/ic_font_download.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_guarantee.xml b/res/drawable/ic_guarantee.xml new file mode 100644 index 0000000000000000000000000000000000000000..7aa61243de0d4146c9f9cd0b828b30ab0b2e8acf --- /dev/null +++ b/res/drawable/ic_guarantee.xml @@ -0,0 +1,26 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_homepage_data_usage.xml b/res/drawable/ic_homepage_data_usage.xml new file mode 100644 index 0000000000000000000000000000000000000000..6d1227bfc114dc09e7badf92edff7ee2a8921045 --- /dev/null +++ b/res/drawable/ic_homepage_data_usage.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_vpn.xml b/res/drawable/ic_homepage_vpn.xml new file mode 100644 index 0000000000000000000000000000000000000000..d1fba0ede6a944bc6393e1bfbd96a139c85611ae --- /dev/null +++ b/res/drawable/ic_homepage_vpn.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_wifi_tethering.xml b/res/drawable/ic_homepage_wifi_tethering.xml new file mode 100644 index 0000000000000000000000000000000000000000..fd4c0511476883ba5fbf65406099b416fcaa8f77 --- /dev/null +++ b/res/drawable/ic_homepage_wifi_tethering.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_person.xml b/res/drawable/ic_person.xml new file mode 100644 index 0000000000000000000000000000000000000000..5e5d0e8f9b09e0785fe4c41fc3a010b0f7c3409f --- /dev/null +++ b/res/drawable/ic_person.xml @@ -0,0 +1,27 @@ + + + + + + diff --git a/res/drawable/ic_qr_code_scanner.xml b/res/drawable/ic_qr_code_scanner.xml new file mode 100644 index 0000000000000000000000000000000000000000..f6f63c5ae7fa98d944885976e1709caecef92fd7 --- /dev/null +++ b/res/drawable/ic_qr_code_scanner.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_settings_safety_center.xml b/res/drawable/ic_settings_safety_center.xml new file mode 100644 index 0000000000000000000000000000000000000000..e817b7194bb80ae579c961ce8a02ca4ed7eea5ab --- /dev/null +++ b/res/drawable/ic_settings_safety_center.xml @@ -0,0 +1,31 @@ + + + + + + + \ No newline at end of file diff --git a/res/xml/accessibility_ring_vibration_settings.xml b/res/drawable/screen_resolution_1080p.xml similarity index 74% rename from res/xml/accessibility_ring_vibration_settings.xml rename to res/drawable/screen_resolution_1080p.xml index 078f76c2ce8ef1f77bbf94659771f0891c42c31e..a9d89ee99973270b097d7144a297cbea8ce9dd3e 100644 --- a/res/xml/accessibility_ring_vibration_settings.xml +++ b/res/drawable/screen_resolution_1080p.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/res/xml/accessibility_touch_vibration_settings.xml b/res/drawable/screen_resolution_1440p.xml similarity index 74% rename from res/xml/accessibility_touch_vibration_settings.xml rename to res/drawable/screen_resolution_1440p.xml index ed8f550a8b9c111d1a0bfd8bfcbd78e2d0ff85eb..a9d89ee99973270b097d7144a297cbea8ce9dd3e 100644 --- a/res/xml/accessibility_touch_vibration_settings.xml +++ b/res/drawable/screen_resolution_1440p.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/res/drawable/sim_progress_dialog_rounded_bg.xml b/res/drawable/sim_progress_dialog_rounded_bg.xml new file mode 100644 index 0000000000000000000000000000000000000000..b29ee4338234d60a12b2a4412f25cdbd351eb07d --- /dev/null +++ b/res/drawable/sim_progress_dialog_rounded_bg.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/res/drawable/user_select_background.xml b/res/drawable/user_select_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..777bff95db748fb23cd4965df9bcc71da664977c --- /dev/null +++ b/res/drawable/user_select_background.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff --git a/res/layout-land/udfps_enroll_enrolling_land.xml b/res/layout-land/udfps_enroll_enrolling_land.xml index 7ccd396936b33b25c2968f43dba6dad3a41e232f..776f8a9118cc3f8d5723c33b3055ee4a4cd8a206 100644 --- a/res/layout-land/udfps_enroll_enrolling_land.xml +++ b/res/layout-land/udfps_enroll_enrolling_land.xml @@ -61,10 +61,10 @@ style="@style/SudGlifIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="?attr/sudGlifHeaderGravity" + android:scaleType="fitStart" android:layout_marginStart="0dp" android:layout_marginEnd="0dp" - android:src="@drawable/ic_fingerprint_header" /> + android:src="@drawable/ic_lock" /> - - - - - - - - - - -