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

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>