xiaoyan159/Android14Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 处理引用依赖问题

Browse Source
This commit is contained in:
xiaoyan159@6800H
2024-12-11 15:28:11 +08:00
parent df105485bd
commit 8454e55c4b
246 changed files with 14884 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Settings/AndroidManifest.xml
View File

@@ -806,7 +806,7 @@
<activity android:name=".network.SimOnboardingActivity"
android:exported="false"
android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
android:theme="@style/Theme.SpaLib.BottomSheetDialog"/>
android:theme="@style/Theme.Material3.DayNight.BottomSheetDialog"/>
<activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
android:exported="false"
@@ -5128,7 +5128,7 @@
<activity
android:name="com.android.settings.network.WepNetworkDialogActivity"
android:exported="true"
android:theme="@style/Theme.SpaLib.Dialog"
android:theme="@style/Theme.Material3.DayNight.Dialog"
android:permission="android.permission.NETWORK_SETTINGS">
</activity>

94
Settings/build.gradle
View File

@@ -1,6 +1,8 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.atomicfu)
alias(libs.plugins.protobuf)
}
//preBuild {
@@ -45,6 +47,7 @@ android {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
res.srcDirs = ['res', 'res-export', 'res-product']
proto.srcDirs = ['protos']
}
buildTypes {
@@ -60,17 +63,26 @@ android {
kotlinOptions {
jvmTarget = '17'
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = '1.5.0' // 假设1.4.0支持Kotlin 1.9.0
}
}
dependencies {
compileOnly files('../libs/framework.jar')
implementation libs.navigation.fragment.ktx
implementation libs.window.window.java
implementation libs.gson
implementation libs.guava
implementation files('../libs/BiometricsSharedLib.jar')
implementation files('../libs/BiometricsSharedLib-java.jar')
implementation files('../libs/SystemUIUnfoldLib.jar')
implementation project(':WifiTrackerLib')
implementation files('../libs/android.hardware.dumpstate-V1-java.jar')
implementation files('../libs/android.hardware.dumpstate-V1.0-java.jar')
implementation files('../libs/android.hardware.dumpstate-V1.1-java.jar')
@@ -78,12 +90,55 @@ dependencies {
implementation files('../libs/net-utils-framework-common.jar')
implementation files('../libs/notification_flags_lib.jar')
implementation files('../libs/securebox.jar')
implementation files('../libs/FingerprintManagerInteractor.jar')
implementation files('../libs/MediaDrmSettingsFlagsLib.jar')
implementation files('../libs/Settings-change-ids.jar')
// SettingsLib的依赖在后面整体配置
implementation files('../libs/aconfig_settings_flags_lib.jar')
implementation files('../libs/accessibility_settings_flags_lib.jar')
implementation files('../libs/app-usage-event-protos-lite.jar')
implementation files('../libs/battery-event-protos-lite.jar')
implementation files('../libs/battery-usage-slot-protos-lite.jar')
implementation files('./libs/contextualcards.aar')
implementation files('../libs/development_settings_flag_lib.jar')
implementation files('../libs/factory_reset_flags_lib.jar')
implementation files('../libs/fuelgauge-log-protos-lite.jar')
implementation files('../libs/fuelgauge-usage-state-protos-lite.jar')
implementation files('../libs/power-anomaly-event-protos-lite.jar')
implementation files('../libs/settings-contextual-card-protos-lite.jar')
implementation files('../libs/settings-log-bridge-protos-lite.jar')
implementation files('../libs/settings-logtags.jar')
implementation files('../libs/settings-telephony-protos-lite.jar')
implementation files('../libs/setupdesign-lottie-loading-layout.jar')
implementation files('../libs/statslog-settings.jar')
implementation files('../libs/settingslib_flags_lib.jar')
implementation files('../libs/wifi_aconfig_flags_lib.jar')
implementation files('../libs/android.view.accessibility.flags-aconfig-java.jar')
implementation files('../libs/telephony_flags_core_java_lib.jar')
// implementation files('../libs/SystemUISharedLib.jar')
implementation libs.androidx.appcompat
implementation libs.material
implementation libs.slice.builders
implementation libs.slice.core
implementation libs.slice.view
implementation libs.lottie
// implementation libs.compose.ui
implementation libs.compose.material3
implementation libs.material.icons.core
implementation libs.preference
implementation libs.room.runtime
annotationProcessor libs.room.compiler
implementation libs.atomicfu
implementation(project(':SettingsLib'))
implementation(project(':SettingsLib:search'))
implementation project(':SettingsLib:ActionBarShadow')
implementation project(':SettingsLib:ActionButtonsPreference')
implementation project(':SettingsLib:ActivityEmbedding')
implementation project(':SettingsLib:AdaptiveIcon')
implementation project(':SettingsLib:AppPreference')
implementation project(':SettingsLib:BannerMessagePreference')
@@ -91,6 +146,7 @@ dependencies {
implementation project(':SettingsLib:ButtonPreference')
implementation project(':SettingsLib:CollapsingToolbarBaseActivity')
implementation project(':SettingsLib:Color')
implementation project(':SettingsLib:DataStore')
implementation project(':SettingsLib:DeviceStateRotationLock')
implementation project(':SettingsLib:DisplayUtils')
implementation project(':SettingsLib:EmergencyNumber')
@@ -113,4 +169,40 @@ dependencies {
implementation project(':SettingsLib:TwoTargetPreference')
implementation project(':SettingsLib:UsageProgressBarPreference')
implementation project(':SettingsLib:Utils')
implementation project(':WifiTrackerLib')
implementation project(':setupdesign')
implementation project(':setupcompat')
implementation project(':iconloaderlib')
// implementation project(':lottie_loading_layout')
implementation project(':spa')
implementation project(':SettingsLib:SpaPrivileged')
implementation libs.protobuf.javalite
implementation libs.protoc
implementation libs.zxing
implementation files('../libs/settingslib_media_flags_lib.jar')
implementation files('../libs/core-all.jar')
implementation libs.dagger
annotationProcessor libs.dagger.compiler
}
protobuf {
protoc {
// 通用 artifact
artifact = 'com.google.protobuf:protoc:3.8.0'
// MacOS
if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
artifact = 'com.google.protobuf:protoc:3.8.0:osx-x86_64'
}
}
generateProtoTasks {
all().each { task ->
task.builtins {
remove java
java {
option "lite"
}
}
}
}
}

4
Settings/res/color/dream_card_color_state_list.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimaryContainer"/>
<item android:color="?androidprv:attr/materialColorSurfaceBright"/>
<item android:state_selected="true" android:color="?attr/materialColorPrimaryContainer"/>
<item android:color="?attr/materialColorSurfaceBright"/>
</selector>

4
Settings/res/color/dream_card_icon_color_state_list.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
<item android:color="?androidprv:attr/materialColorPrimary"/>
<item android:state_selected="true" android:color="?attr/materialColorOnPrimaryContainer"/>
<item android:color="?attr/materialColorPrimary"/>
</selector>

4
Settings/res/color/dream_card_summary_color_state_list.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
<item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/>
<item android:state_selected="true" android:color="?attr/materialColorOnPrimaryContainer"/>
<item android:color="?attr/materialColorOnSurfaceVariant"/>
</selector>

4
Settings/res/color/dream_card_text_color_state_list.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
<item android:color="?androidprv:attr/materialColorOnSurface"/>
<item android:state_selected="true" android:color="?attr/materialColorOnPrimaryContainer"/>
<item android:color="?attr/materialColorOnSurface"/>
</selector>

8
Settings/res/drawable/accessibility_contrast_button_background.xml
View File

@@ -22,9 +22,9 @@
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
<solid android:color="?attr/materialColorSurfaceContainerHighest" />
<stroke
android:color="?androidprv:attr/materialColorSecondary"
android:color="?attr/materialColorSecondary"
android:width="@dimen/contrast_button_stroke_width" />
<corners android:radius="@dimen/contrast_button_radius"/>
</shape>
@@ -41,7 +41,7 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorPrimary"
android:fillColor="?attr/materialColorPrimary"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10c5.52,0 10,-4.48 10,-10S17.52,2 12,2zM10.59,16.6l-4.24,-4.24l1.41,-1.41l2.83,2.83l5.66,-5.66l1.41,1.41L10.59,16.6z"/>
</vector>
</item>
@@ -55,7 +55,7 @@
android:left="@dimen/contrast_button_stroke_width"
android:right="@dimen/contrast_button_stroke_width">
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
<solid android:color="?attr/materialColorSurfaceContainerHighest" />
<corners android:radius="@dimen/contrast_button_radius"/>
</shape>
</item>

2
Settings/res/drawable/action_button_bg.xml
View File

@@ -26,7 +26,7 @@
<shape android:shape="rectangle">
<corners android:radius="8dp" />
<stroke android:width="1dp"
android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
android:color="?attr/colorAccentPrimaryVariant"/>
</shape>
</inset>
</item>

2
Settings/res/drawable/battery_hints_chip_bg.xml
View File

@@ -18,6 +18,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="?androidprv:attr/materialColorPrimaryContainer" />
<solid android:color="?attr/materialColorPrimaryContainer" />
<corners android:radius="@dimen/battery_hints_chip_corner_radius" />
</shape>

2
Settings/res/drawable/broadcast_button_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
<stroke android:color="?attr/materialColorPrimaryContainer"
android:width="1dp"
/>
<padding android:left="16dp"

2
Settings/res/drawable/color_contrast_preview_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
<solid android:color="?attr/materialColorSurfaceContainerHigh"/>
<corners android:radius="20dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_bottom_appbar_background.xml
View File

@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
<solid android:color="?attr/materialColorSurfaceContainer"/>
<corners
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"

2
Settings/res/drawable/color_contrast_preview_button_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorTertiaryContainer"/>
<solid android:color="?attr/materialColorTertiaryContainer"/>
<corners android:radius="7dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_dialog_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorSurfaceContainerLow"/>
<solid android:color="?attr/materialColorSurfaceContainerLow"/>
<corners android:radius="12dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_icon_edit_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorPrimary"/>
<solid android:color="?attr/materialColorPrimary"/>
<corners android:radius="20dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_icon_group_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="oval" >
<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
<solid android:color="?attr/materialColorSurfaceContainer"/>
<size android:width="36dp" android:height="36dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_icon_inbox_background.xml
View File

@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorSecondaryContainer"/>
<solid android:color="?attr/materialColorSecondaryContainer"/>
<corners android:radius="20dp" />
<size android:height="30dp" android:width="60dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_icon_star_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="oval" >
<solid android:color="?androidprv:attr/materialColorPrimary"/>
<solid android:color="?attr/materialColorPrimary"/>
<size android:width="36dp" android:height="36dp" />
</shape>

2
Settings/res/drawable/color_contrast_preview_tag_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
<solid android:color="?attr/materialColorSurfaceContainerHighest"/>
<corners android:radius="4dp" />
</shape>

2
Settings/res/drawable/dream_default_preview_icon.xml
View File

@@ -20,6 +20,6 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
<path android:fillColor="?attr/materialColorOnSurfaceVariant"
android:pathData="M3,19Q2.175,19 1.588,18.413Q1,17.825 1,17V7Q1,6.175 1.588,5.588Q2.175,5 3,5H13Q13.825,5 14.413,5.588Q15,6.175 15,7V17Q15,17.825 14.413,18.413Q13.825,19 13,19ZM3,17H13Q13,17 13,17Q13,17 13,17V7Q13,7 13,7Q13,7 13,7H3Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17ZM17,19V5H19V19ZM21,19V5H23V19ZM4,15H12L9.4,11.5L7.5,14L6.1,12.15ZM3,7Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17Q3,17 3,17Q3,17 3,17V7Q3,7 3,7Q3,7 3,7Z"/>
</vector>

2
Settings/res/drawable/dream_preview_rounded_bg.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
<solid android:color="?attr/materialColorSurfaceContainer" />
<corners android:radius="@dimen/dream_item_corner_radius"/>
</shape>

2
Settings/res/drawable/ic_article_24dp.xml
View File

@@ -22,6 +22,6 @@
android:tint="?attr/colorControlNormal"
android:autoMirrored="true">
<path
android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:fillColor="?attr/materialColorOnSurfaceVariant"
android:pathData="M19,5v14L5,19L5,5h14m0,-2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
</vector>

2
Settings/res/drawable/ic_article_filled_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorOnTertiaryContainer"
android:fillColor="?attr/materialColorOnTertiaryContainer"
android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM14,17H7v-2h7V17zM17,13H7v-2h10V13zM17,9H7V7h10V9z"/>
</vector>

2
Settings/res/drawable/ic_chat_bubble_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:fillColor="?attr/materialColorOnSurfaceVariant"
android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L4,16L4,4h16v12z"/>
</vector>

2
Settings/res/drawable/ic_check_24dp.xml
View File

@@ -18,7 +18,7 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?androidprv:attr/colorAccent">
android:tint="?attr/colorAccent">
<path
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"
android:fillColor="@android:color/white"/>

2
Settings/res/drawable/ic_edit_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorOnPrimary"
android:fillColor="?attr/materialColorOnPrimary"
android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0L3,16.82L3,21h4.18L20.41,7.77c0.79,-0.78 0.79,-2.05 0,-2.83zM6.41,19.06L5,19v-1.36l9.82,-9.82 1.41,1.41 -9.82,9.83z"/>
</vector>

2
Settings/res/drawable/ic_group_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorSecondary"
android:fillColor="?attr/materialColorSecondary"
android:pathData="M15,8c0,-1.42 -0.5,-2.73 -1.33,-3.76C14.09,4.1 14.53,4 15,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4c-0.43,0 -0.84,-0.09 -1.23,-0.21c-0.03,-0.01 -0.06,-0.02 -0.1,-0.03C14.5,10.73 15,9.42 15,8zM16.66,13.13C18.03,14.06 19,15.32 19,17v3h4v-3C23,14.82 19.42,13.53 16.66,13.13zM9,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4s-4,-1.79 -4,-4S6.79,4 9,4zM9,13c2.67,0 8,1.34 8,4v3H1v-3C1,14.34 6.33,13 9,13z"/>
</vector>

2
Settings/res/drawable/ic_inbox_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorOnSecondaryContainer"
android:fillColor="?attr/materialColorOnSecondaryContainer"
android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,5v9h-4.18c-0.41,1.16 -1.51,2 -2.82,2s-2.4,-0.84 -2.82,-2H5V5H19z"/>
</vector>

2
Settings/res/drawable/ic_modifier_keys_reset.xml
View File

@@ -21,7 +21,7 @@
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?androidprv:attr/materialColorPrimary">
android:tint="?attr/materialColorPrimary">
<path
android:fillColor="@android:color/white"
android:pathData="M18,4C13.58,0.69 7.31,1.58 4,6V4H2v6h6V8H5.09c1.44,-2.47 4.09,-3.98 6.94,-3.97c4.42,0.02 7.99,3.61 7.97,8.03s-3.61,7.99 -8.03,7.97C7.55,20.01 3.98,16.42 4,12H2c0,3.15 1.48,6.11 4,8c4.42,3.31 10.69,2.42 14,-2C23.31,13.58 22.42,7.31 18,4z"/>

2
Settings/res/drawable/ic_star_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorOnPrimary"
android:fillColor="?attr/materialColorOnPrimary"
android:pathData="M14.43,10l-2.43,-8l-2.43,8l-7.57,0l6.18,4.41l-2.35,7.59l6.17,-4.69l6.18,4.69l-2.35,-7.59l6.17,-4.41z"/>
</vector>

2
Settings/res/drawable/modifier_key_bordered.xml
View File

@@ -25,7 +25,7 @@
<solid android:color="@android:color/transparent"/>
<stroke
android:width="1dp"
android:color="?androidprv:attr/materialColorPrimary"/>
android:color="?attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
Settings/res/drawable/modifier_key_colored.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="?androidprv:attr/materialColorPrimary"/>
<solid android:color="?attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
Settings/res/drawable/modifier_key_lisetview_background.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
<solid android:color="?attr/materialColorSurfaceContainerHighest"/>
</shape>
</item>
</ripple>

2
Settings/res/drawable/rounded_bg.xml
View File

@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
<solid android:color="?attr/materialColorSurfaceContainer" />
<corners
android:bottomLeftRadius="?android:attr/dialogCornerRadius"
android:topLeftRadius="?android:attr/dialogCornerRadius"

2
Settings/res/drawable/sim_confirm_dialog_btn_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
<stroke android:color="?attr/materialColorPrimaryContainer"
android:width="1dp" />
<padding android:left="16dp"
android:top="8dp"

2
Settings/res/drawable/trackpad_bordered.xml
View File

@@ -25,7 +25,7 @@
<solid android:color="@android:color/transparent"/>
<stroke
android:width="1dp"
android:color="?androidprv:attr/materialColorPrimary"/>
android:color="?attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
Settings/res/drawable/trackpad_button_done_colored.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="?androidprv:attr/materialColorPrimary"/>
<solid android:color="?attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

4
Settings/res/drawable/user_select_background.xml
View File

@@ -19,13 +19,13 @@
android:color="@color/settingslib_ripple_color">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
<solid android:color="?attr/materialColorSurfaceContainer"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer" android:width="1dp"/>
<stroke android:color="?attr/materialColorPrimaryContainer" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>

2
Settings/res/drawable/volume_dialog_button_background_outline.xml
View File

@@ -21,7 +21,7 @@
<shape
android:shape="rectangle">
<stroke
android:color="?androidprv:attr/materialColorPrimaryContainer"
android:color="?attr/materialColorPrimaryContainer"
android:width="1dp"/>
<corners android:radius="24dp"/>
<padding

2
Settings/res/drawable/volume_dialog_button_background_solid.xml
View File

@@ -29,6 +29,6 @@
android:right="16dp"
android:top="8dp"
android:bottom="8dp" />
<solid android:color="?androidprv:attr/colorAccentPrimary" />
<solid android:color="?attr/colorAccentPrimary" />
</shape>
</inset>

16
Settings/res/layout/accessibility_color_contrast_preview.xml
View File

@@ -28,7 +28,7 @@
<View
android:id="@+id/preview_background"
android:background="?androidprv:attr/materialColorSurface"
android:background="?attr/materialColorSurface"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -47,7 +47,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?androidprv:attr/textColorPrimary"
android:textColor="?attr/textColorPrimary"
android:text="@string/color_contrast_preview" />
<View
@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="17dp"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textColor="?attr/materialColorOnSurface"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/ic_group"
app:layout_constraintTop_toTopOf="@+id/email_background"
@@ -93,7 +93,7 @@
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textColor="?attr/materialColorOnSurfaceVariant"
android:textSize="11sp"
app:layout_constraintStart_toStartOf="@+id/sender_name"
app:layout_constraintTop_toBottomOf="@+id/sender_name"
@@ -104,7 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textColor="?attr/materialColorOnSurface"
android:background="@drawable/color_contrast_preview_tag_background"
android:textSize="11sp"
app:layout_constraintStart_toEndOf="@+id/sender_name"
@@ -130,7 +130,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:layout_marginTop="62dp"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textColor="?attr/materialColorOnSurface"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/email_background"
app:layout_constraintTop_toTopOf="@+id/email_background"
@@ -140,7 +140,7 @@
android:id="@+id/email_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textColor="?attr/materialColorOnSurfaceVariant"
android:textSize="12sp"
android:paddingBottom="8dp"
android:maxLines="2"
@@ -173,7 +173,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="8dp"
android:textColor="?androidprv:attr/materialColorOnTertiaryContainer"
android:textColor="?attr/materialColorOnTertiaryContainer"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/ic_article_filled"
app:layout_constraintTop_toTopOf="@+id/attachment_background"

6
Settings/res/layout/accessibility_color_contrast_selector.xml
View File

@@ -69,7 +69,7 @@
android:gravity="center_horizontal|top"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_default"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="?attr/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -102,7 +102,7 @@
android:gravity="center_horizontal|top"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_medium"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="?attr/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -135,7 +135,7 @@
android:gravity="center_horizontal|top"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_high"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="?attr/materialColorOnSurface"/>
</LinearLayout>
<Space

2
Settings/res/layout/face_enroll_accessibility_toggle.xml
View File

@@ -51,7 +51,7 @@
android:letterSpacing="0"
android:minHeight="20dp"
android:fontFamily="@string/sudFontSecondaryText"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"/>
android:textColor="?attr/materialColorOnSurfaceVariant"/>
<!-- Toggle -->
<com.google.android.material.materialswitch.MaterialSwitch

2
Settings/res/layout/modifier_key_item.xml
View File

@@ -31,7 +31,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:src="@drawable/ic_check_24dp"
android:tint="?androidprv:attr/materialColorPrimary"/>
android:tint="?attr/materialColorPrimary"/>
<TextView
android:id="@+id/modifier_key_text"

2
Settings/res/layout/modifier_key_picker_dialog.xml
View File

@@ -107,7 +107,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:textColor="?attr/materialColorOnPrimary"
android:text="@string/modifier_keys_done"/>
</RelativeLayout>

2
Settings/res/layout/power_anomaly_hints.xml
View File

@@ -38,6 +38,6 @@
android:paddingHorizontal="8dp"
android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="?attr/materialColorOnSurface"/>
</LinearLayout>

25
Settings/res/layout/private_space_confirm_deletion.xml
View File

@@ -14,17 +14,20 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<com.google.android.setupdesign.GlifLoadingLayout
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/private_space_delete_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:icon="@drawable/ic_delete_accent"
app:sudUsePartnerHeavyTheme="true"
app:sudIllustrationType="default"
app:sudDescriptionText = "@string/private_space_confirm_deletion_summary"
app:sucHeaderText="@string/private_space_confirm_deletion_header">
</com.google.android.setupdesign.GlifLoadingLayout>
android:layout_height="match_parent">
<com.google.android.setupdesign.GlifLoadingLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/private_space_delete_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:icon="@drawable/ic_delete_accent"
app:sudUsePartnerHeavyTheme="true"
app:sudDescriptionText="@string/private_space_confirm_deletion_summary"
app:sucHeaderText="@string/private_space_confirm_deletion_header" />
</FrameLayout>

4
Settings/res/layout/trackpad_gesture_preview.xml
View File

@@ -82,7 +82,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/TrackpadButtonDone"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:textColor="?attr/materialColorOnPrimary"
android:text="@string/gesture_button_next"/>
<Button
@@ -96,7 +96,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/TrackpadButtonDone"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:textColor="?attr/materialColorOnPrimary"
android:text="@string/gesture_button_done"/>
</RelativeLayout>

2
Settings/res/values-night/colors.xml
View File

@@ -19,7 +19,7 @@
<color name="homepage_accessibility_background">#783BE5</color>
<color name="homepage_support_background">#3F5FBD</color>
<color name="contextual_card_background">@*android:color/material_grey_900</color>
<color name="search_bar_background">?androidprv:attr/materialColorSurfaceContainerHigh</color>
<color name="search_bar_background">?attr/materialColorSurfaceContainerHigh</color>
<color name="notification_importance_button_unselected">#5F6368</color>
<!-- Palette list preference colors. -->

33
Settings/res/values/attrs.xml
View File

@@ -203,4 +203,37 @@
<declare-styleable name="BackgroundPreference">
<attr name="background" format="reference" />
</declare-styleable>
<!-- 缺少元素补充 -->
<attr name="materialColorSurfaceBright" format="color" />
<attr name="materialColorSurfaceContainerHigh" format="color" />
<attr name="materialColorSurfaceContainer" format="color" />
<attr name="materialColorOutlineVariant" format="color" />
<attr name="materialColorOnSurfaceVariant" format="color" />
<attr name="materialColorSecondaryContainer" format="color" />
<attr name="materialColorOnSecondaryContainer" format="color" />
<attr name="materialColorPrimaryContainer" format="color" />
<attr name="materialColorOnPrimaryContainer" format="color" />
<attr name="materialColorPrimary" format="color" />
<attr name="materialColorOnSurface" format="color" />
<attr name="materialColorSurfaceContainerHighest" format="color" />
<attr name="materialColorSecondary" format="color" />
<attr name="materialColorTertiaryContainer" format="color" />
<attr name="materialColorSurfaceContainerLow" format="color" />
<attr name="materialColorOnTertiaryContainer" format="color" />
<attr name="materialColorOnPrimary" format="color" />
<attr name="materialColorSurface" format="color" />
<attr name="textColorPrimary" format="color" />
<attr name="titleItemStartPadding" format="dimension" />
<attr name="contentStartPadding" format="dimension" />
<attr name="contentEndPadding" format="dimension" />
<attr name="endItemStartPadding" format="dimension" />
<attr name="endItemEndPadding" format="dimension" />
<attr name="bottomDividerStartPadding" format="dimension" />
<attr name="bottomDividerEndPadding" format="dimension" />
<attr name="actionDividerHeight" format="dimension" />
<attr name="titleSize" format="dimension" />
</resources>

4
Settings/res/values/colors.xml
View File

@@ -94,7 +94,7 @@
<color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
<!-- Search bar background color -->
<color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
<color name="search_bar_background">?attr/materialColorSurfaceBright</color>
<color name="face_enroll_icon_color">#42a5f5</color> <!-- Blue 400 -->
@@ -166,7 +166,7 @@
<color name="battery_info_error_color_black">@*android:color/primary_text_default_material_light</color>
<!-- Background for multiple user settings page avatars -->
<color name="user_avatar_color_bg">?androidprv:attr/materialColorSurfaceContainer</color>
<color name="user_avatar_color_bg">?attr/materialColorSurfaceContainer</color>
<!-- Icon tint color for battery usage system icon -->
<color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>

4
Settings/res/values/strings.xml
View File

@@ -13,7 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<resources
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Strings for Dialog yes button -->
<string name="yes">"Yes"</string>
<!-- Strings for Dialog no button -->

2
Settings/res/values/styles.xml
View File

@@ -448,7 +448,7 @@
<item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
<item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
<item name="cardBackgroundColor">?androidprv:attr/materialColorSurfaceContainer</item>
<item name="cardBackgroundColor">?attr/materialColorSurfaceContainer</item>
<item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
<item name="cardElevation">0dp</item>
<item name="rippleColor">?android:attr/colorControlHighlight</item>

10
Settings/res/values/themes.xml
View File

@@ -67,12 +67,12 @@
<item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
<item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
<item name="notification_importance_button_border_color_unselected">?androidprv:attr/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="notification_importance_button_border_color_unselected">?attr/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">?attr/materialColorOnSurfaceVariant</item>
<item name="notification_importance_button_background_color_selected">?androidprv:attr/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_background_color_selected">?attr/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">?attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">?attr/materialColorOnSecondaryContainer</item>
</style>
<!-- Variant of the settings theme with no action bar. -->

20
Settings/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
View File

@@ -40,7 +40,7 @@ import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import dalvik.system.VMRuntime;
//import dalvik.system.VMRuntime;
import java.util.ArrayList;
import java.util.List;
@@ -218,15 +218,15 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref
}
private static String chooseAbi(ApplicationInfo ai) {
final String isa = VMRuntime.getCurrentInstructionSet();
if (ai.primaryCpuAbi != null
&& isa.equals(VMRuntime.getInstructionSet(ai.primaryCpuAbi))) {
return ai.primaryCpuAbi;
}
if (ai.secondaryCpuAbi != null
&& isa.equals(VMRuntime.getInstructionSet(ai.secondaryCpuAbi))) {
return ai.secondaryCpuAbi;
}
// final String isa = VMRuntime.getCurrentInstructionSet();
// if (ai.primaryCpuAbi != null
// && isa.equals(VMRuntime.getInstructionSet(ai.primaryCpuAbi))) {
// return ai.primaryCpuAbi;
// }
// if (ai.secondaryCpuAbi != null
// && isa.equals(VMRuntime.getInstructionSet(ai.secondaryCpuAbi))) {
// return ai.secondaryCpuAbi;
// }
return null;
}
}

27
Settings/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -56,6 +56,7 @@ import android.util.Log;
import android.widget.ImageView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.core.text.BidiFormatter;
import androidx.preference.Preference;
@@ -80,6 +81,7 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.search.SearchIndexableRaw;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference;
@@ -194,6 +196,31 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private static final int TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY = 1;
private static final int COLUMN_CARRIER_NAME = 0;
@Override
public void updateNonIndexableKeys(List<String> keys) {
PreferenceControllerMixin.super.updateNonIndexableKeys(keys);
}
@Override
public void updateRawDataToIndex(List<SearchIndexableRaw> rawData) {
PreferenceControllerMixin.super.updateRawDataToIndex(rawData);
}
@Override
public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
PreferenceControllerMixin.super.updateDynamicRawDataToIndex(rawData);
}
@Override
public void onForget(@NonNull WifiDialog2 dialog) {
WifiDialog2Listener.super.onForget(dialog);
}
@Override
public void onScan(@NonNull WifiDialog2 dialog, @NonNull String ssid) {
WifiDialog2Listener.super.onScan(dialog, ssid);
}
private class CarrierIdAsyncQueryHandler extends AsyncQueryHandler {
private CarrierIdAsyncQueryHandler(Context context) {