Snap for 12923841 from e8f5daaf88aeaae24a85f790bf0d111e69d690cc to 25Q2-release (26adf16d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -5271,7 +5271,7 @@
		android:permission="android.permission.MASTER_CLEAR"
		android:label="@string/main_clear_title"
		android:exported="true"
		android:theme="@style/SudThemeGlif.Light">
		android:theme="@style/SettingsSudThemeGlif.Light">
		<intent-filter>
		<action android:name="com.android.settings.action.FACTORY_RESET"/>
		<category android:name="android.intent.category.DEFAULT"/>
		@@ -5285,7 +5285,7 @@
		<activity android:name="Settings$FactoryResetConfirmActivity"
		android:label="@string/main_clear_confirm_title"
		android:exported="false"
		android:theme="@style/SudThemeGlif.Light">
		android:theme="@style/SettingsSudThemeGlif.Light">
		</activity>

		<activity

aconfig/development/settings_core_flag_declarations.aconfig

+0 −7

Original line number	Diff line number	Diff line
		package: "com.android.settings.development"
		container: "system"

		flag {
		name: "a2dp_offload_codec_extensibility_settings"
		namespace: "bluetooth"
		description: "Feature flag for Bluetooth Audio Codec extensibility in Settings"
		bug: "323319530"
		}

		flag {
		name: "deprecate_list_activity"
		namespace: "android_settings"

res/layout/bluetooth_audio_codec_dialog.xml

deleted100644 → 0

+0 −75

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

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

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

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:padding="8dp">

		<RadioGroup
		android:id="@+id/bluetooth_audio_codec_radio_group"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/developer_option_dialog_margin_start">

		<include
		android:id="@+id/bluetooth_audio_codec_default"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_sbc"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_aac"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_aptx"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_aptx_hd"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_ldac"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_lc3"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		<include
		android:id="@+id/bluetooth_audio_codec_opus"
		layout="@layout/preference_widget_dialog_radiobutton"/>

		</RadioGroup>

		<include
		android:id="@+id/bluetooth_audio_codec_help_info"
		layout="@layout/preference_widget_dialog_summary"/>

		</LinearLayout>

		</ScrollView>

res/values/themes.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@
		<!-- Homepage should follow device default design, the values is same as device default theme.-->
		<item name="android:navigationBarColor">@android:color/white</item>
		<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
		<item name="android:colorBackground">@android:color/system_surface_container_light</item>
		<item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainerLow</item>
		</style>

		<style name="Theme.Settings.Home.NoAnimation">
		@@ -247,4 +247,8 @@
		<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
		<item name="colorAccent">@*android:color/accent_device_default_light</item>
		</style>

		<style name="SettingsSudThemeGlif.Light" parent="@style/SudThemeGlif.Light">
		<item name="android:background">@color/settingslib_materialColorSurfaceContainerLowest</item>
		</style>
		</resources>

res/xml/development_settings.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -434,14 +434,6 @@
		android:key="bluetooth_hd_audio_settings"
		android:title="@string/bluetooth_profile_a2dp_high_quality_unknown_codec"/>

		<com.android.settings.development.bluetooth.BluetoothCodecDialogPreference
		android:key="bluetooth_audio_codec_settings"
		android:title="@string/bluetooth_select_a2dp_codec_type"
		android:dialogTitle="@string/bluetooth_select_a2dp_codec_type_dialog_title"
		android:dialogLayout="@layout/bluetooth_audio_codec_dialog"
		android:positiveButtonText=""
		android:negativeButtonText="@string/dlg_ok"/>

		<ListPreference
		android:key="bluetooth_audio_codec_settings_list"
		android:title="@string/bluetooth_select_a2dp_codec_type"