Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (302e76ba) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ android_library {
		"WifiTrackerLib",
		"SettingsLibActivityEmbedding",
		"Settings-change-ids",
		"SystemUIUnfoldLib",
		"org.lineageos.platform.internal",
		"LineagePreferenceLib",
		"vendor.lineage.fastcharge-V1.0-java",

AndroidManifest.xml

+45 −7

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@
		<uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />
		<uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" />
		<uses-permission android:name="android.permission.START_VIEW_APP_FEATURES" />
		<uses-permission android:name="android.permission.CUSTOMIZE_SYSTEM_UI" />

		<application
		android:name=".SettingsApplication"
		@@ -146,6 +147,7 @@
		android:configChanges="orientation\|keyboard\|keyboardHidden\|screenSize\|screenLayout\|smallestScreenSize">
		<intent-filter android:priority="1">
		<action android:name="android.settings.SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -231,6 +233,7 @@
		<action android:name="android.settings.WIRELESS_SETTINGS" />
		<action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />
		<action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -262,6 +265,7 @@
		<action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
		<action android:name="android.settings.DATA_ROAMING_SETTINGS" />
		<action android:name="android.settings.MMS_MESSAGE_SETTING" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		@@ -289,6 +293,7 @@
		android:icon="@drawable/ic_homepage_connected_device">
		<intent-filter android:priority="1">
		<action android:name="android.settings.BLUETOOTH_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -338,6 +343,7 @@
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<intent-filter android:priority="1">
		<action android:name="android.settings.WIFI_SETTINGS"/>
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT"/>
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -461,6 +467,7 @@
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<intent-filter android:priority="1">
		<action android:name="android.settings.WIFI_IP_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -797,6 +804,7 @@
		android:icon="@drawable/ic_homepage_vpn">
		<intent-filter android:priority="1">
		<action android:name="android.settings.VPN_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<action android:name="android.net.vpn.SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		@@ -833,6 +841,7 @@
		android:icon="@drawable/ic_settings_date_time">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DATE_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -856,6 +865,7 @@
		android:icon="@drawable/ic_settings_language">
		<intent-filter android:priority="1">
		<action android:name="android.settings.LOCALE_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -913,6 +923,7 @@
		android:label="@string/available_virtual_keyboard_category">
		<intent-filter android:priority="1">
		<action android:name="android.settings.INPUT_METHOD_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -927,6 +938,7 @@
		android:label="@string/assist_and_voice_input_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.VOICE_INPUT_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -1045,6 +1057,7 @@
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="41">
		@@ -1104,6 +1117,7 @@
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -1206,6 +1220,7 @@
		<intent-filter android:priority="1">
		<action android:name="com.android.settings.DISPLAY_SETTINGS" />
		<action android:name="android.settings.DISPLAY_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="30">
		@@ -1251,6 +1266,7 @@
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -1311,6 +1327,7 @@
		android:icon="@drawable/ic_homepage_about">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DEVICE_INFO_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<action android:name="android.settings.DEVICE_NAME" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		@@ -1395,6 +1412,7 @@
		<action android:name="android.settings.APPLICATION_SETTINGS" />
		<action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
		<action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="20">
		@@ -1454,6 +1472,7 @@
		android:label="@string/high_power_apps">
		<intent-filter android:priority="1">
		<action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -1651,6 +1670,7 @@
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<intent-filter android:priority="1">
		<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="52">
		@@ -1709,6 +1729,7 @@
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<intent-filter android:priority="1">
		<action android:name="android.settings.SECURITY_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<action android:name="android.credentials.UNLOCK" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		@@ -1736,6 +1757,8 @@
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.security.SecurityAdvancedSettings" />
		<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
		android:value="@string/menu_key_security"/>
		</activity>

		<activity android:name="MonitoringCertInfoActivity"
		@@ -1791,6 +1814,7 @@
		android:icon="@drawable/ic_settings_privacy">
		<intent-filter>
		<action android:name="android.settings.PRIVACY_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -1912,6 +1936,7 @@
		android:label="@string/usage_access_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -1960,6 +1985,7 @@
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<intent-filter android:priority="1">
		<action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="60">
		@@ -2109,6 +2135,7 @@
		android:label="@string/accessibility_captioning_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.CAPTIONING_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -2262,6 +2289,7 @@
		android:theme="@style/GlifTheme.Light">
		<intent-filter>
		<action android:name="android.settings.BIOMETRIC_ENROLL" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		@@ -2278,6 +2306,7 @@
		android:theme="@style/GlifTheme.Light">
		<intent-filter>
		<action android:name="android.settings.FINGERPRINT_ENROLL" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		@@ -2447,6 +2476,7 @@
		<intent-filter android:priority="1">
		<action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
		<action android:name="android.settings.MEMORY_CARD_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="50">
		@@ -2601,6 +2631,7 @@
		android:icon="@drawable/ic_settings_print">
		<intent-filter android:priority="1">
		<action android:name="android.settings.ACTION_PRINT_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -2798,6 +2829,7 @@
		android:icon="@drawable/ic_cast_24dp">
		<intent-filter android:priority="1">
		<action android:name="android.settings.CAST_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -2877,6 +2909,7 @@
		android:icon="@drawable/ic_homepage_battery">
		<intent-filter android:priority="1">
		<action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -2936,6 +2969,7 @@
		android:label="@string/header_add_an_account">
		<intent-filter android:priority="1">
		<action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -2959,6 +2993,7 @@
		android:taskAffinity="com.android.settings.FallbackHome"
		android:exported="true"
		android:theme="@style/FallbackHome"
		android:permission="android.permission.DEVICE_POWER"
		android:configChanges="keyboardHidden">
		<intent-filter android:priority="-1000">
		<action android:name="android.intent.action.MAIN" />
		@@ -2974,6 +3009,7 @@
		android:icon="@drawable/ic_homepage_data_usage">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DATA_USAGE_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="3">
		@@ -3006,6 +3042,7 @@
		android:icon="@drawable/ic_settings_display">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DREAM_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -3043,13 +3080,6 @@
		android:value="true" />
		</activity>

		<activity
		android:name=".users.AddSupervisedUserActivity"
		android:label="@*android:string/supervised_user_creation_label"
		android:icon="@drawable/ic_settings_multiuser"
		android:exported="true">
		</activity>

		<activity
		android:name="Settings$PaymentSettingsActivity"
		android:label="@string/nfc_payment_settings_title"
		@@ -3057,6 +3087,7 @@
		android:icon="@drawable/ic_settings_nfc_payment">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -3109,6 +3140,7 @@
		android:label="@string/manage_notification_access_title" >
		<intent-filter android:priority="1">
		<action android:name="android.settings.NOTIFICATION_LISTENER_DETAIL_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -3123,6 +3155,7 @@
		android:label="@string/notification_assistant_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NOTIFICATION_ASSISTANT_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -3327,6 +3360,7 @@
		<intent-filter android:priority="1">
		<action android:name="com.android.settings.SOUND_SETTINGS" />
		<action android:name="android.settings.SOUND_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		@@ -3425,6 +3459,7 @@
		android:enabled="@bool/config_show_regulatory_info">
		<intent-filter>
		<action android:name="android.settings.SHOW_REGULATORY_INFO" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -3653,6 +3688,7 @@
		android:label="@string/write_settings_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		@@ -3915,6 +3951,7 @@
		android:icon="@drawable/ic_homepage_accounts">
		<intent-filter android:priority="1">
		<action android:name="android.settings.SYNC_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="53">
		@@ -4119,6 +4156,7 @@
		android:label="@string/connected_device_connections_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NFC_SETTINGS" />
		<category android:name="android.intent.category.BROWSABLE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="1">

res/drawable/ic_audio_ring.xml→res/drawable/ia_settings_communal.xml

+24 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 The CyanogenMod Project
		Copyright (C) 2018 The LineageOS Project
		<!-- Copyright (C) 2022 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -15,14 +12,13 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:tint="?android:attr/colorControlNormal">

		<path
		android:fillColor="@android:color/black"
		android:pathData="M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M17,11A5,5 0 0,0 12,6A5,5 0 0,0 7,11V18H17V11M19.75,3.19L18.33,4.61C20.04,6.3 21,8.6 21,11H23C23,8.07 21.84,5.25 19.75,3.19M1,11H3C3,8.6 3.96,6.3 5.67,4.61L4.25,3.19C2.16,5.25 1,8.07 1,11Z" />
		<path android:fillColor="@android:color/white"
		android:pathData="M24,38Q19,38 15.5,37.325Q12,36.65 12,35.7V34H7.25Q5.95,34 5.05,33.025Q4.15,32.05 4.25,30.75L5.8,12.75Q5.9,11.6 6.75,10.8Q7.6,10 8.75,10H39.25Q40.4,10 41.25,10.8Q42.1,11.6 42.2,12.75L43.75,30.75Q43.85,32.05 42.95,33.025Q42.05,34 40.75,34H36V35.7Q36,36.65 32.5,37.325Q29,38 24,38ZM7.25,31H40.75Q40.75,31 40.75,31Q40.75,31 40.75,31L39.25,13Q39.25,13 39.25,13Q39.25,13 39.25,13H8.75Q8.75,13 8.75,13Q8.75,13 8.75,13L7.25,31Q7.25,31 7.25,31Q7.25,31 7.25,31Z"/>
		</vector>

res/layout/add_supervised_user.xml→res/drawable/ic_battery_dock_defender_untriggered_24dp.xml

+30 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2021 The Android Open Source Project
		~ Copyright (C) 2022 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		@@ -15,18 +14,17 @@
		~ limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_margin="16dp"
		android:orientation="vertical">
		<Button
		android:id="@+id/createSupervisedUser"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:text="@*android:string/supervised_user_creation_label" />
		<TextView
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:text="@string/placeholder_activity" />
		</LinearLayout>
		No newline at end of file
		<vector
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:name="vector"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:name="path"
		android:pathData="M 18 20.673 C 18 21.027 17.859 21.367 17.609 21.617 C 17.359 21.867 17.019 22.008 16.665 22.008 L 7.335 22.008 C 6.981 22.008 6.641 21.867 6.391 21.617 C 6.141 21.367 6 21.027 6 20.673 L 6 5.328 C 6 4.977 6.139 4.639 6.386 4.389 C 6.633 4.139 6.969 3.997 7.32 3.993 L 9.495 3.993 L 9.495 1.998 L 14.49 1.998 L 14.49 3.993 L 16.665 3.993 C 16.84 3.993 17.014 4.028 17.176 4.095 C 17.338 4.162 17.485 4.26 17.609 4.384 C 17.733 4.508 17.831 4.655 17.898 4.817 C 17.965 4.979 18 5.153 18 5.328 L 18 20.673 Z M 9 13.503 L 13.005 6.003 L 13.005 11.508 L 15 11.508 L 10.995 19.008 L 10.995 13.503 L 9 13.503 Z"
		android:strokeWidth="1"
		android:fillColor="?android:attr/colorAccent"
		android:fillType="evenOdd"/>
		</vector>