Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 12777764 from b4cbd1913b to 25Q2-release

Browse Source 
Change-Id: I0b53bf127872ce93584705d91ba4948c0837e10f
This commit is contained in:
Android Build Coastguard Worker
2024-12-11 00:17:50 +00:00
parent e5eebf0e42 b4cbd1913b
commit 43aa641bad
82 changed files with 603 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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="@androidprv:color/materialColorPrimaryContainer"/>
<item android:color="@androidprv:color/materialColorSurfaceBright"/>
</selector>

4
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="@androidprv:color/materialColorOnPrimaryContainer"/>
<item android:color="@androidprv:color/materialColorPrimary"/>
</selector>

4
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="@androidprv:color/materialColorOnPrimaryContainer"/>
<item android:color="@androidprv:color/materialColorOnSurfaceVariant"/>
</selector>

4
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="@androidprv:color/materialColorOnPrimaryContainer"/>
<item android:color="@androidprv:color/materialColorOnSurface"/>
</selector>

6
res/color/modes_icon_selectable_background.xml
View File

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

6
res/color/modes_icon_selectable_icon.xml
View File

@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_pressed="true" android:color="?androidprv:attr/materialColorOnPrimary" />
<item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary" />
<item android:color="?androidprv:attr/materialColorOnSecondaryContainer" />
<item android:state_pressed="true" android:color="@androidprv:color/materialColorOnPrimary" />
<item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimary" />
<item android:color="@androidprv:color/materialColorOnSecondaryContainer" />
</selector>

8
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="@androidprv:color/materialColorSurfaceContainerHighest" />
<stroke
android:color="?androidprv:attr/materialColorSecondary"
android:color="@androidprv:color/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="@androidprv:color/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="@androidprv:color/materialColorSurfaceContainerHighest" />
<corners android:radius="@dimen/contrast_button_radius"/>
</shape>
</item>

2
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="@androidprv:color/materialColorPrimaryContainer"
android:width="1dp"
/>
<padding android:left="16dp"

2
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="@androidprv:color/materialColorSurfaceContainerHigh"/>
<corners android:radius="20dp" />
</shape>

2
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="@androidprv:color/materialColorSurfaceContainer"/>
<corners
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"

2
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="@androidprv:color/materialColorTertiaryContainer"/>
<corners android:radius="7dp" />
</shape>

2
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="@androidprv:color/materialColorSurfaceContainerLow"/>
<corners android:radius="12dp" />
</shape>

2
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/materialColorPrimaryContainer"/>
<solid android:color="@androidprv:color/materialColorPrimaryContainer"/>
<corners android:radius="24dp" />
</shape>

2
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/materialColorSurfaceContainerHighest"/>
<solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
<size android:width="36dp" android:height="36dp" />
</shape>

2
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="@androidprv:color/materialColorSecondaryContainer"/>
<corners android:radius="20dp" />
<size android:height="30dp" android:width="60dp" />
</shape>

2
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="@androidprv:color/materialColorPrimary"/>
<size android:width="36dp" android:height="36dp" />
</shape>

2
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="@androidprv:color/materialColorSurfaceContainerHighest"/>
<corners android:radius="4dp" />
</shape>

2
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="@androidprv:color/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
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="@androidprv:color/materialColorSurfaceContainer" />
<corners android:radius="@dimen/dream_item_corner_radius"/>
</shape>

2
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="@androidprv:color/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
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="@androidprv:color/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
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="@androidprv:color/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
res/drawable/ic_edit_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?androidprv:attr/materialColorOnPrimaryContainer"
android:fillColor="@androidprv:color/materialColorOnPrimaryContainer"
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
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="@androidprv:color/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
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="@androidprv:color/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
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="@androidprv:color/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
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="@androidprv:color/materialColorOnPrimary"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27z"/>
</vector>

2
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="@androidprv:color/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
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="@androidprv:color/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
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="@androidprv:color/materialColorSurfaceContainerHighest"/>
</shape>
</item>
</ripple>

2
res/drawable/pointer_icon_fill_container_background.xml
View File

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

2
res/drawable/preference_circular_icons_plus_item_background.xml
View File

@@ -21,5 +21,5 @@
<size
android:width="@dimen/zen_mode_circular_icon_diameter"
android:height="@dimen/zen_mode_circular_icon_diameter" />
<solid android:color="?androidprv:attr/materialColorSecondaryContainer" />
<solid android:color="@androidprv:color/materialColorSecondaryContainer" />
</shape>

2
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="@androidprv:color/materialColorSurfaceContainer" />
<corners
android:bottomLeftRadius="?android:attr/dialogCornerRadius"
android:topLeftRadius="?android:attr/dialogCornerRadius"

2
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="@androidprv:color/materialColorPrimaryContainer"
android:width="1dp" />
<padding android:left="16dp"
android:top="8dp"

2
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="@androidprv:color/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
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="@androidprv:color/materialColorPrimary"/>
</shape>
</item>
</ripple>

4
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="@androidprv:color/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="@androidprv:color/materialColorPrimaryContainer" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>

2
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="@androidprv:color/materialColorPrimaryContainer"
android:width="1dp"/>
<corners android:radius="24dp"/>
<padding

14
res/layout/accessibility_color_contrast_preview.xml
View File

@@ -31,7 +31,7 @@
android:id="@+id/preview_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?androidprv:attr/materialColorSurface"
android:background="@androidprv:color/materialColorSurface"
app:layout_constraintBottom_toTopOf="@+id/bottom_appbar_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -96,7 +96,7 @@
android:maxLines="1"
android:paddingEnd="10dp"
android:text="@string/color_contrast_preview_sender_name"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textColor="@androidprv:color/materialColorOnSurface"
android:textSize="12sp"
app:layout_constraintEnd_toStartOf="@+id/email_tag"
app:layout_constraintHorizontal_bias="0"
@@ -116,7 +116,7 @@
android:maxLines="1"
android:paddingHorizontal="4dp"
android:text="@string/color_contrast_preview_email_badge"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textColor="@androidprv:color/materialColorOnSurface"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/sender_name"
@@ -134,7 +134,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/color_contrast_preview_email_send_date"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:textSize="11sp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_background"
@@ -173,7 +173,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/color_contrast_preview_email_title"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textColor="@androidprv:color/materialColorOnSurface"
android:textSize="16sp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_main_background"
@@ -189,7 +189,7 @@
android:maxLines="2"
android:paddingBottom="8dp"
android:text="@string/color_contrast_preview_email_body"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_main_background"
@@ -228,7 +228,7 @@
android:maxLines="1"
android:paddingEnd="10dp"
android:text="@string/color_contrast_preview_email_attachment_name"
android:textColor="?androidprv:attr/materialColorOnTertiaryContainer"
android:textColor="@androidprv:color/materialColorOnTertiaryContainer"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="@+id/attachment_background"

6
res/layout/accessibility_color_contrast_selector.xml
View File

@@ -72,7 +72,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_default"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="@androidprv:color/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -107,7 +107,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_medium"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="@androidprv:color/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -142,7 +142,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_high"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="@androidprv:color/materialColorOnSurface"/>
</LinearLayout>
<Space

2
res/layout/homepage_preference.xml
View File

@@ -78,7 +78,7 @@
android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:maxLines="4"
android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase"

2
res/layout/homepage_preference_v2.xml
View File

@@ -78,7 +78,7 @@
android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:maxLines="4"
android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase"

18
res/layout/le_audio_bt_entity_header.xml
View File

@@ -176,5 +176,23 @@
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
</LinearLayout>
<LinearLayout
android:id="@+id/bt_battery_mono"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/le_bluetooth_battery_start_margin"
android:layout_marginTop="@dimen/le_bluetooth_battery_top_margin"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:visibility="gone"
android:focusable="true">
<TextView
android:id="@+id/bt_battery_mono_summary"
style="@style/TextAppearance.EntityHeaderSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/le_bluetooth_summary_padding"
android:drawablePadding="@dimen/le_bluetooth_summary_drawable_padding"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

2
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="@androidprv:color/materialColorPrimary"/>
<TextView
android:id="@+id/modifier_key_text"

2
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="@androidprv:color/materialColorOnPrimary"
android:text="@string/modifier_keys_done"/>
</RelativeLayout>

4
res/layout/notification_ls_minimalism_selector.xml
View File

@@ -74,7 +74,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/lock_screen_notifs_show_compact"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="@androidprv:color/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -109,7 +109,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/lock_screen_notifs_show_full_list"
android:textColor="?androidprv:attr/materialColorOnSurface"/>
android:textColor="@androidprv:color/materialColorOnSurface"/>
</LinearLayout>
<Space

2
res/layout/pointer_icon_fill_style_layout.xml
View File

@@ -32,7 +32,7 @@
android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"
android:text="@string/pointer_fill_style"
android:textSize="14sp"
android:textColor="?androidprv:attr/materialColorPrimary"
android:textColor="@androidprv:color/materialColorPrimary"
android:textAlignment="viewStart"
android:fontWeight="500" />

2
res/layout/pointer_icon_stroke_style_layout.xml
View File

@@ -31,7 +31,7 @@
android:layout_marginTop="@dimen/pointer_stroke_style_padding"
android:text="@string/pointer_stroke_style"
android:textSize="14sp"
android:textColor="?androidprv:attr/materialColorPrimary"
android:textColor="@androidprv:color/materialColorPrimary"
android:textAlignment="viewStart"
android:fontWeight="500"
android:textAppearance="?android:attr/textAppearanceListItem" />

4
res/layout/preference_background.xml
View File

@@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
android:textColor="@androidprv:color/materialColorOnPrimaryContainer"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:hyphenationFrequency="normalFast"
@@ -78,7 +78,7 @@
android:layout_alignStart="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
android:textColor="@androidprv:color/materialColorOnPrimaryContainer"
android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase"
android:maxLines="4"

2
res/layout/preference_circular_icons_plus_item.xml
View File

@@ -26,7 +26,7 @@
android:padding="4dp"
android:drawablePadding="0dp"
android:background="@drawable/preference_circular_icons_plus_item_background"
android:textColor="?androidprv:attr/materialColorOnSecondaryContainer"
android:textColor="@androidprv:color/materialColorOnSecondaryContainer"
android:maxLines="1"
android:autoSizeTextType="uniform"
android:autoSizeMinTextSize="6sp" />

2
res/layout/preference_widget_arrow.xml
View File

@@ -23,5 +23,5 @@
android:layout_gravity="center_vertical"
android:contentDescription="@null"
android:scaleType="center"
android:tint="?androidprv:attr/materialColorOnPrimaryContainer"
android:tint="@androidprv:color/materialColorOnPrimaryContainer"
android:src="@drawable/ic_arrow_forward" />

4
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="@androidprv:color/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="@androidprv:color/materialColorOnPrimary"
android:text="@string/gesture_button_done"/>
</RelativeLayout>

2
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/materialColorSurfaceBright</color>
<color name="search_bar_background">@androidprv:color/materialColorSurfaceBright</color>
<color name="notification_importance_button_unselected">#5F6368</color>
<!-- Palette list preference colors. -->

4
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">@androidprv:color/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">@androidprv:color/materialColorSurfaceContainer</color>
<!-- Icon tint color for battery usage system icon -->
<color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>

4
res/values/styles.xml
View File

@@ -249,7 +249,7 @@
<item name="android:layout_gravity">center</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textSize">@dimen/search_bar_text_size</item>
<item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="android:textColor">@androidprv:color/materialColorOnSurfaceVariant</item>
<item name="android:singleLine">true</item>
</style>
@@ -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">@androidprv:color/materialColorSurfaceContainer</item>
<item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
<item name="cardElevation">0dp</item>
<item name="rippleColor">?android:attr/colorControlHighlight</item>

10
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">@androidprv:color/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">@androidprv:color/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">@androidprv:color/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
<!-- For AppCompat widgets, e.g. TextInputLayout -->
<item name="colorAccent">?android:attr/colorAccent</item>

10
res/values/themes_expressive.xml
View File

@@ -59,12 +59,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">@androidprv:color/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">@androidprv:color/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">@androidprv:color/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">@androidprv:color/materialColorOnSecondaryContainer</item>
<!-- For AppCompat widgets, e.g. TextInputLayout -->
<item name="colorAccent">?android:attr/colorAccent</item>

1
res/xml/bluetooth_screen.xml
View File

@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="bluetooth_switchbar_screen"
android:title="@string/bluetooth_settings_title">
<SwitchPreferenceCompat

3
src/com/android/settings/Utils.java
View File

@@ -1330,8 +1330,7 @@ public final class Utils extends com.android.settingslib.Utils {
*/
@ColorInt
public static int getHomepageIconColor(Context context) {
return getColorAttrDefaultColor(
context, com.android.internal.R.attr.materialColorOnSurface);
return context.getColor(com.android.internal.R.color.materialColorOnSurface);
}
/**

7
src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
View File

@@ -162,18 +162,13 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
}
final int side = device.getDeviceSide();
if (side == HearingAidInfo.DeviceSide.SIDE_LEFT_AND_RIGHT) {
return mContext.getString(
R.string.accessibility_hearingaid_left_and_right_side_device_summary, name);
} else if (side == HearingAidInfo.DeviceSide.SIDE_LEFT) {
if (side == HearingAidInfo.DeviceSide.SIDE_LEFT) {
return mContext.getString(
R.string.accessibility_hearingaid_left_side_device_summary, name);
} else if (side == HearingAidInfo.DeviceSide.SIDE_RIGHT) {
return mContext.getString(
R.string.accessibility_hearingaid_right_side_device_summary, name);
}
// Invalid side
return mContext.getString(
R.string.accessibility_hearingaid_active_device_summary, name);
}

11
src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
View File

@@ -225,6 +225,8 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
return R.id.bt_battery_left_summary;
} else if (containerId == R.id.bt_battery_right) {
return R.id.bt_battery_right_summary;
} else if (containerId == R.id.bt_battery_mono) {
return R.id.bt_battery_mono_summary;
}
Log.d(TAG, "No summary resource id. The containerId is " + containerId);
return INVALID_RESOURCE_ID;
@@ -237,6 +239,8 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
updateBatteryLayout(R.id.bt_battery_left, BluetoothUtils.META_INT_ERROR);
// hide the right
updateBatteryLayout(R.id.bt_battery_right, BluetoothUtils.META_INT_ERROR);
// hide the mono
updateBatteryLayout(R.id.bt_battery_mono, BluetoothUtils.META_INT_ERROR);
}
private void updateBatteryLayout() {
@@ -261,11 +265,6 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
int deviceId = leAudioProfile.getAudioLocation(cachedDevice.getDevice());
Log.d(TAG, "LeAudioDevices:" + cachedDevice.getDevice().getAnonymizedAddress()
+ ", deviceId:" + deviceId);
if (deviceId == BluetoothLeAudio.AUDIO_LOCATION_INVALID) {
Log.d(TAG, "The device does not support the AUDIO_LOCATION.");
return;
}
boolean isLeft = (deviceId & LEFT_DEVICE_ID) != 0;
boolean isRight = (deviceId & RIGHT_DEVICE_ID) != 0;
boolean isLeftRight = isLeft && isRight;
@@ -280,6 +279,8 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
updateBatteryLayout(R.id.bt_battery_left, cachedDevice.getBatteryLevel());
} else if (isRight) {
updateBatteryLayout(R.id.bt_battery_right, cachedDevice.getBatteryLevel());
} else if (deviceId == BluetoothLeAudio.AUDIO_LOCATION_MONO) {
updateBatteryLayout(R.id.bt_battery_mono, cachedDevice.getBatteryLevel());
} else {
Log.d(TAG, "The device id is other Audio Location. Do nothing.");
}

44
src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
View File

@@ -15,8 +15,10 @@
*/
package com.android.settings.connecteddevice;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -31,6 +33,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.bluetooth.AlwaysDiscoverable;
import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController;
import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -50,7 +53,6 @@ import com.android.settingslib.widget.FooterPreference;
public class BluetoothDashboardFragment extends DashboardFragment {
private static final String TAG = "BluetoothDashboardFrag";
private static final String KEY_BLUETOOTH_SCREEN_FOOTER = "bluetooth_screen_footer";
private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -58,6 +60,8 @@ public class BluetoothDashboardFragment extends DashboardFragment {
private SettingsMainSwitchBar mSwitchBar;
private BluetoothSwitchPreferenceController mController;
private @Nullable AlwaysDiscoverable mAlwaysDiscoverable;
@Override
public int getMetricsCategory() {
return SettingsEnums.BLUETOOTH_FRAGMENT;
@@ -81,7 +85,9 @@ public class BluetoothDashboardFragment extends DashboardFragment {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
mFooterPreference = findPreference(KEY_BLUETOOTH_SCREEN_FOOTER);
if (!isCatalystEnabled()) {
mFooterPreference = findPreference(BluetoothFooterPreference.KEY);
}
}
@Override
@@ -93,6 +99,9 @@ public class BluetoothDashboardFragment extends DashboardFragment {
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (isCatalystEnabled()) {
return;
}
String callingAppPackageName = PasswordUtils.getCallingAppPackageName(
getActivity().getActivityToken());
String action = getIntent() != null ? getIntent().getAction() : "";
@@ -114,8 +123,37 @@ public class BluetoothDashboardFragment extends DashboardFragment {
}
}
@Override
public void onStart() {
super.onStart();
if (isCatalystEnabled()) {
Activity activity = requireActivity();
String callingAppPackageName = PasswordUtils.getCallingAppPackageName(
activity.getActivityToken());
Intent intent = activity.getIntent();
String action = intent != null ? intent.getAction() : "";
if (DEBUG) {
Log.d(TAG, "onActivityCreated() calling package name is : " + callingAppPackageName
+ ", action : " + action);
}
if (isAlwaysDiscoverable(callingAppPackageName, action)) {
mAlwaysDiscoverable = new AlwaysDiscoverable(activity);
mAlwaysDiscoverable.start();
}
}
}
@Override
public void onStop() {
super.onStop();
if (mAlwaysDiscoverable != null) {
mAlwaysDiscoverable.stop();
mAlwaysDiscoverable = null;
}
}
@VisibleForTesting
boolean isAlwaysDiscoverable(String callingAppPackageName, String action) {
boolean isAlwaysDiscoverable(@Nullable String callingAppPackageName, @Nullable String action) {
return TextUtils.equals(SLICE_ACTION, action) ? false
: TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, callingAppPackageName)
|| TextUtils.equals(Utils.SYSTEMUI_PACKAGE_NAME, callingAppPackageName);

13
src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt
View File

@@ -17,7 +17,10 @@ package com.android.settings.connecteddevice
import android.content.Context
import com.android.settings.R
import com.android.settings.Settings.BluetoothDashboardActivity
import com.android.settings.flags.Flags
import com.android.settings.utils.makeLaunchIntent
import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.ProvidePreferenceScreen
import com.android.settingslib.metadata.preferenceHierarchy
import com.android.settingslib.preference.PreferenceScreenCreator
@@ -39,7 +42,15 @@ class BluetoothDashboardScreen : PreferenceScreenCreator {
override fun fragmentClass() = BluetoothDashboardFragment::class.java
override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
makeLaunchIntent(context, BluetoothDashboardActivity::class.java, metadata?.key)
override fun getPreferenceHierarchy(context: Context) =
preferenceHierarchy(this) {
val bluetoothDataStore = BluetoothPreference.createDataStore(context)
+BluetoothPreference(bluetoothDataStore)
+BluetoothFooterPreference(bluetoothDataStore)
}
companion object {
const val KEY = "bluetooth_switchbar_screen"

96
src/com/android/settings/connecteddevice/BluetoothFooterPreference.kt Normal file
View File

@@ -0,0 +1,96 @@
/*
* Copyright (C) 2024 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.
*/
package com.android.settings.connecteddevice
import android.app.settings.SettingsEnums
import android.content.Context
import android.content.Intent
import android.util.Log
import androidx.preference.Preference
import com.android.settings.R
import com.android.settings.bluetooth.Utils
import com.android.settings.core.SubSettingLauncher
import com.android.settings.location.BluetoothScanningFragment
import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.PreferenceSummaryProvider
import com.android.settingslib.preference.PreferenceBinding
import com.android.settingslib.widget.FooterPreference
class BluetoothFooterPreference(private val bluetoothDataStore: BluetoothDataStore) :
PreferenceMetadata, PreferenceBinding, PreferenceSummaryProvider {
override val key: String
get() = KEY
override fun isIndexable(context: Context) = false
override fun dependencies(context: Context) = arrayOf(BluetoothPreference.KEY)
override fun intent(context: Context): Intent? = subSettingLauncher(context).toIntent()
override fun createWidget(context: Context) = FooterPreference(context)
override fun bind(preference: Preference, metadata: PreferenceMetadata) {
super.bind(preference, metadata)
preference.isSelectable = false
val bluetoothDisabled = bluetoothDataStore.getBoolean(BluetoothPreference.KEY) != true
val footerPreference = preference as FooterPreference
val context = preference.context
if (bluetoothDisabled && Utils.isBluetoothScanningEnabled(context)) {
footerPreference.setLearnMoreText(context.getString(R.string.bluetooth_scan_change))
footerPreference.setLearnMoreAction { subSettingLauncher(context).launch() }
} else {
footerPreference.setLearnMoreText("")
footerPreference.setLearnMoreAction(null)
}
}
private fun subSettingLauncher(context: Context) =
SubSettingLauncher(context)
.setDestination(BluetoothScanningFragment::class.java.name)
.setSourceMetricsCategory(SettingsEnums.BLUETOOTH_FRAGMENT)
override fun getSummary(context: Context): CharSequence? {
val bluetoothDisabled = bluetoothDataStore.getBoolean(BluetoothPreference.KEY) != true
val resId =
if (bluetoothDisabled && Utils.isBluetoothScanningEnabled(context)) {
when (isAutoOnFeatureAvailable()) {
true -> R.string.bluetooth_scanning_on_info_message_auto_on_available
else -> R.string.bluetooth_scanning_on_info_message
}
} else {
when (isAutoOnFeatureAvailable()) {
true -> R.string.bluetooth_empty_list_bluetooth_off_auto_on_available
else -> R.string.bluetooth_empty_list_bluetooth_off
}
}
return context.getString(resId)
}
private fun isAutoOnFeatureAvailable() =
try {
bluetoothDataStore.bluetoothAdapter?.isAutoOnSupported == true
} catch (e: Exception) {
Log.e(TAG, "isAutoOnSupported failed", e)
false
}
companion object {
const val KEY = "bluetooth_screen_footer"
const val TAG = "BluetoothFooterPreference"
}
}

99
src/com/android/settings/connecteddevice/BluetoothMainSwitchPreference.kt
View File

@@ -1,99 +0,0 @@
/*
* Copyright (C) 2024 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.
*/
package com.android.settings.connecteddevice
import android.bluetooth.BluetoothAdapter
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import com.android.settings.R
import com.android.settings.widget.MainSwitchBarMetadata
import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.NoOpKeyedObservable
import com.android.settingslib.metadata.PreferenceLifecycleContext
import com.android.settingslib.metadata.PreferenceLifecycleProvider
import com.android.settingslib.metadata.ReadWritePermit
class BluetoothMainSwitchPreference(private val bluetoothAdapter: BluetoothAdapter?) :
MainSwitchBarMetadata, PreferenceLifecycleProvider {
private lateinit var broadcastReceiver: BroadcastReceiver
override val key
get() = "use_bluetooth"
override val title
get() = R.string.bluetooth_main_switch_title
override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun storage(context: Context) = BluetoothStateStore(bluetoothAdapter)
override fun onStart(context: PreferenceLifecycleContext) {
broadcastReceiver =
object : BroadcastReceiver() {
override fun onReceive(receiverContext: Context, intent: Intent) {
context.notifyPreferenceChange(key)
}
}
context.registerReceiver(
broadcastReceiver,
IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED),
Context.RECEIVER_EXPORTED_UNAUDITED
)
}
override fun onStop(context: PreferenceLifecycleContext) {
if (::broadcastReceiver.isInitialized) {
context.unregisterReceiver(broadcastReceiver)
}
}
override fun isEnabled(context: Context): Boolean {
return bluetoothAdapter?.state.let {
it == BluetoothAdapter.STATE_ON || it == BluetoothAdapter.STATE_OFF
}
}
@Suppress("UNCHECKED_CAST")
class BluetoothStateStore(private val bluetoothAdapter: BluetoothAdapter?) :
NoOpKeyedObservable<String>(), KeyValueStore {
override fun contains(key: String) = true
override fun <T : Any> getValue(key: String, valueType: Class<T>): T? {
return (bluetoothAdapter?.state.let {
it == BluetoothAdapter.STATE_ON || it == BluetoothAdapter.STATE_TURNING_ON
}) as T
}
override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
if (value is Boolean) {
if (value) {
bluetoothAdapter?.enable()
} else {
bluetoothAdapter?.disable()
}
}
}
}
}

175
src/com/android/settings/connecteddevice/BluetoothPreference.kt Normal file
View File

@@ -0,0 +1,175 @@
/*
* Copyright (C) 2024 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.
*/
package com.android.settings.connecteddevice
import android.annotation.SuppressLint
import android.bluetooth.BluetoothAdapter
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.UserManager
import android.provider.Settings
import android.widget.Toast
import androidx.preference.Preference
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
import com.android.settings.network.SatelliteWarningDialogActivity
import com.android.settings.widget.MainSwitchBarMetadata
import com.android.settingslib.WirelessUtils
import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.DataChangeReason
import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.ReadWritePermit
import com.android.settingslib.metadata.SensitivityLevel
@SuppressLint("MissingPermission")
class BluetoothPreference(private val bluetoothDataStore: BluetoothDataStore) :
MainSwitchBarMetadata, PreferenceRestrictionMixin, Preference.OnPreferenceChangeListener {
override val key
get() = KEY
override val title
get() = R.string.bluetooth_main_switch_title
override val restrictionKeys: Array<String>
get() = arrayOf(UserManager.DISALLOW_BLUETOOTH, UserManager.DISALLOW_CONFIG_BLUETOOTH)
override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
when {
isSatelliteOn(context, 3000) ||
(value == true &&
!WirelessUtils.isRadioAllowed(context, Settings.Global.RADIO_BLUETOOTH)) ->
ReadWritePermit.DISALLOW
else -> ReadWritePermit.ALLOW
}
override val sensitivityLevel
get() = SensitivityLevel.LOW_SENSITIVITY
override fun storage(context: Context) = bluetoothDataStore
override fun isEnabled(context: Context): Boolean {
return super<PreferenceRestrictionMixin>.isEnabled(context) &&
bluetoothDataStore.bluetoothAdapter?.state.let {
it == BluetoothAdapter.STATE_ON || it == BluetoothAdapter.STATE_OFF
}
}
override fun bind(preference: Preference, metadata: PreferenceMetadata) {
super.bind(preference, metadata)
preference.onPreferenceChangeListener = this
}
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
val context = preference.context
if (isSatelliteOn(context, 3000)) {
context.startActivity(
Intent(context, SatelliteWarningDialogActivity::class.java)
.putExtra(
SatelliteWarningDialogActivity.EXTRA_TYPE_OF_SATELLITE_WARNING_DIALOG,
SatelliteWarningDialogActivity.TYPE_IS_BLUETOOTH,
)
)
return false
}
// Show toast message if Bluetooth is not allowed in airplane mode
if (
newValue == true &&
!WirelessUtils.isRadioAllowed(context, Settings.Global.RADIO_BLUETOOTH)
) {
Toast.makeText(context, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show()
return false
}
return true
}
@Suppress("UNCHECKED_CAST")
private class BluetoothStorage(
private val context: Context,
override val bluetoothAdapter: BluetoothAdapter?,
) : AbstractKeyedDataObservable<String>(), BluetoothDataStore {
private var broadcastReceiver: BroadcastReceiver? = null
override fun contains(key: String) = key == KEY && bluetoothAdapter != null
override fun <T : Any> getValue(key: String, valueType: Class<T>): T {
return (bluetoothAdapter?.state.let {
it == BluetoothAdapter.STATE_ON || it == BluetoothAdapter.STATE_TURNING_ON
})
as T
}
@Suppress("DEPRECATION")
override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
if (value is Boolean) {
if (value) {
bluetoothAdapter?.enable()
} else {
bluetoothAdapter?.disable()
}
}
}
@SuppressLint("WrongConstant")
override fun onFirstObserverAdded() {
broadcastReceiver =
object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
notifyChange(KEY, DataChangeReason.UPDATE)
}
}
context.registerReceiver(
broadcastReceiver,
IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED),
Context.RECEIVER_EXPORTED_UNAUDITED,
)
}
override fun onLastObserverRemoved() {
context.unregisterReceiver(broadcastReceiver)
}
}
companion object {
const val KEY = "use_bluetooth"
@Suppress("DEPRECATION")
fun createDataStore(context: Context) =
createDataStore(context, BluetoothAdapter.getDefaultAdapter())
fun createDataStore(
context: Context,
bluetoothAdapter: BluetoothAdapter?,
): BluetoothDataStore = BluetoothStorage(context, bluetoothAdapter)
}
}
/** Datastore of the bluetooth preference. */
interface BluetoothDataStore : KeyValueStore {
val bluetoothAdapter: BluetoothAdapter?
}

5
src/com/android/settings/dashboard/profileselector/UserAdapter.java
View File

@@ -39,7 +39,6 @@ import android.widget.TextView;
import com.android.internal.util.UserIcons;
import com.android.internal.widget.RecyclerView;
import com.android.settings.R;
import com.android.settingslib.Utils;
import java.util.ArrayList;
import java.util.List;
@@ -62,8 +61,8 @@ public class UserAdapter extends BaseAdapter {
mUserHandle = userHandle;
mUserManager = um;
UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
int tintColor = Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.materialColorPrimary);
int tintColor = context.getColor(com.android.internal.R.color.materialColorPrimary);
if (userInfo.isManagedProfile()
|| (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()

5
src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
View File

@@ -332,9 +332,8 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
setBackgroundColor(Color.TRANSPARENT);
mTrapezoidSolidColor = Utils.getColorAccentDefaultColor(context);
mTrapezoidColor = Utils.getDisabled(context, mTrapezoidSolidColor);
mTrapezoidHoverColor =
Utils.getColorAttrDefaultColor(
context, com.android.internal.R.attr.materialColorSecondaryContainer);
mTrapezoidHoverColor = context.getColor(
com.android.internal.R.color.materialColorSecondaryContainer);
// Initializes the divider line paint.
final Resources resources = getContext().getResources();
mDividerWidth = resources.getDimensionPixelSize(R.dimen.chartview_divider_width);

3
src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java
View File

@@ -316,7 +316,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment {
}
private int getColorOfMaterialColorPrimary() {
return Utils.getColorAttrDefaultColor(
mActivity, com.android.internal.R.attr.materialColorPrimary);
return mActivity.getColor(com.android.internal.R.color.materialColorPrimary);
}
}

4
src/com/android/settings/inputmethod/ModifierKeysPreferenceController.java
View File

@@ -36,7 +36,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
import com.android.settingslib.widget.LayoutPreference;
import java.util.ArrayList;
@@ -202,8 +201,7 @@ public class ModifierKeysPreferenceController extends BasePreferenceController {
}
private int getColorOfMaterialColorPrimary() {
return Utils.getColorAttrDefaultColor(
mContext, com.android.internal.R.attr.materialColorPrimary);
return mContext.getColor(com.android.internal.R.color.materialColorPrimary);
}
private static boolean isCtrl(int keyCode) {

4
src/com/android/settings/inputmethod/ModifierKeysRestorePreferenceController.java
View File

@@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.Utils;
public class ModifierKeysRestorePreferenceController extends BasePreferenceController {
@@ -88,7 +87,6 @@ public class ModifierKeysRestorePreferenceController extends BasePreferenceContr
}
private int getColorOfMaterialColorPrimary() {
return Utils.getColorAttrDefaultColor(
mParent.getActivity(), com.android.internal.R.attr.materialColorPrimary);
return mParent.getActivity().getColor(com.android.internal.R.color.materialColorPrimary);
}
}

18
src/com/android/settings/network/AirplaneModePreference.kt
View File

@@ -26,13 +26,13 @@ import android.os.UserManager
import android.provider.Settings
import android.telephony.PhoneStateListener
import android.telephony.TelephonyManager
import android.util.Log
import androidx.annotation.DrawableRes
import androidx.preference.Preference
import com.android.settings.AirplaneModeEnabler
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.Utils
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.DataChangeReason
@@ -45,8 +45,6 @@ import com.android.settingslib.metadata.PreferenceLifecycleProvider
import com.android.settingslib.metadata.ReadWritePermit
import com.android.settingslib.metadata.SensitivityLevel
import com.android.settingslib.metadata.SwitchPreference
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
// LINT.IfChange
class AirplaneModePreference :
@@ -113,9 +111,7 @@ class AirplaneModePreference :
context.getSystemService(TelephonyManager::class.java)?.let {
phoneStateListener =
object : PhoneStateListener(Looper.getMainLooper()) {
@Deprecated("Deprecated in Java")
override fun onRadioPowerStateChanged(state: Int) {
Log.d(TAG, "onRadioPowerStateChanged(), state=$state")
notifyChange(KEY, DataChangeReason.UPDATE)
}
}
@@ -163,17 +159,6 @@ class AirplaneModePreference :
context.getSystemService(TelephonyManager::class.java),
)
private fun isSatelliteOn(context: Context): Boolean {
try {
return SatelliteRepository(context)
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS)
} catch (e: Exception) {
Log.e(TAG, "Error to get satellite status : $e")
}
return false
}
private fun showEcmDialog(context: PreferenceLifecycleContext) {
val intent =
Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null)
@@ -192,7 +177,6 @@ class AirplaneModePreference :
}
companion object {
const val TAG = "AirplaneModePreference"
const val KEY = Settings.Global.AIRPLANE_MODE_ON
const val DEFAULT_VALUE = false
const val REQUEST_CODE_EXIT_ECM = 1

6
src/com/android/settings/network/NetworkDashboardScreen.kt
View File

@@ -17,9 +17,12 @@ package com.android.settings.network
import android.content.Context
import com.android.settings.R
import com.android.settings.Settings.NetworkDashboardActivity
import com.android.settings.datausage.DataSaverScreen
import com.android.settings.flags.Flags
import com.android.settings.utils.makeLaunchIntent
import com.android.settingslib.metadata.PreferenceIconProvider
import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.ProvidePreferenceScreen
import com.android.settingslib.metadata.preferenceHierarchy
import com.android.settingslib.preference.PreferenceScreenCreator
@@ -44,6 +47,9 @@ class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {
override fun fragmentClass() = NetworkDashboardFragment::class.java
override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
makeLaunchIntent(context, NetworkDashboardActivity::class.java, metadata?.key)
override fun getPreferenceHierarchy(context: Context) =
preferenceHierarchy(this) {
+MobileNetworkListScreen.KEY order -15

12
src/com/android/settings/network/SatelliteRepository.kt
View File

@@ -26,6 +26,8 @@ import androidx.concurrent.futures.CallbackToFutureAdapter
import com.google.common.util.concurrent.Futures.immediateFuture
import com.google.common.util.concurrent.ListenableFuture
import java.util.concurrent.Executor
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asExecutor
@@ -203,5 +205,15 @@ class SatelliteRepository(
fun setIsSessionStartedForTesting(isEnabled: Boolean) {
this.isSessionStarted = isEnabled
}
fun isSatelliteOn(context: Context, timeoutMs: Long = 2000): Boolean =
try {
SatelliteRepository(context)
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
.get(timeoutMs, TimeUnit.MILLISECONDS)
} catch (e: Exception) {
Log.e(TAG, "Error to get satellite status : $e")
false
}
}
}

3
src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java
View File

@@ -33,8 +33,7 @@ public class LockScreenNotificationsPreferencePageFragment extends DashboardFrag
@Override
public int getMetricsCategory() {
//TODO(b/367455695): create a new metrics category
return SettingsEnums.SETTINGS_LOCK_SCREEN_PREFERENCES;
return SettingsEnums.SETTINGS_NOTIFICATIONS_ON_LOCK_SCREEN;
}
@Override

50
src/com/android/settings/notification/modes/IconUtil.java
View File

@@ -23,6 +23,7 @@ import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.Typeface;
@@ -36,6 +37,7 @@ import android.util.StateSet;
import android.view.Gravity;
import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -81,21 +83,19 @@ class IconUtil {
Drawable base = composeIcons(
context.getResources(),
background,
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorSecondaryContainer),
context.getColor(com.android.internal.R.color.materialColorSecondaryContainer),
outerSizePx,
modeIcon,
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorOnSecondaryContainer),
context.getColor(com.android.internal.R.color.materialColorOnSecondaryContainer),
innerSizePx);
Drawable selected = composeIcons(
context.getResources(),
background,
Utils.getColorAttr(context, com.android.internal.R.attr.materialColorPrimary),
context.getColor(com.android.internal.R.color.materialColorPrimary),
outerSizePx,
modeIcon,
Utils.getColorAttr(context, com.android.internal.R.attr.materialColorOnPrimary),
context.getColor(com.android.internal.R.color.materialColorOnPrimary),
innerSizePx);
StateListDrawable result = new StateListDrawable();
@@ -114,13 +114,11 @@ class IconUtil {
static Drawable makeIconPickerHeader(@NonNull Context context, Drawable icon) {
return composeIconCircle(
context.getResources(),
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorSecondaryContainer),
context.getColor(com.android.internal.R.color.materialColorSecondaryContainer),
context.getResources().getDimensionPixelSize(
R.dimen.zen_mode_icon_list_header_circle_diameter),
icon,
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorOnSecondaryContainer),
context.getColor(com.android.internal.R.color.materialColorOnSecondaryContainer),
context.getResources().getDimensionPixelSize(
R.dimen.zen_mode_icon_list_header_icon_size));
}
@@ -151,13 +149,11 @@ class IconUtil {
@DrawableRes int iconResId) {
return composeIconCircle(
context.getResources(),
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorSecondaryContainer),
context.getColor(com.android.internal.R.color.materialColorSecondaryContainer),
context.getResources().getDimensionPixelSize(
R.dimen.zen_mode_circular_icon_diameter),
checkNotNull(context.getDrawable(iconResId)),
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorOnSecondaryContainer),
context.getColor(com.android.internal.R.color.materialColorOnSecondaryContainer),
context.getResources().getDimensionPixelSize(
R.dimen.zen_mode_circular_icon_inner_icon_size));
}
@@ -172,12 +168,10 @@ class IconUtil {
if (Strings.isNullOrEmpty(displayName)) {
return composeIconCircle(
context.getResources(),
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorTertiaryContainer),
context.getColor(com.android.internal.R.color.materialColorTertiaryContainer),
res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_diameter),
checkNotNull(context.getDrawable(R.drawable.ic_zen_mode_generic_contact)),
Utils.getColorAttr(context,
com.android.internal.R.attr.materialColorOnTertiaryContainer),
context.getColor(com.android.internal.R.color.materialColorOnTertiaryContainer),
res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_inner_icon_size));
}
@@ -187,14 +181,14 @@ class IconUtil {
Canvas canvas = new Canvas(bitmap);
Paint circlePaint = new Paint();
circlePaint.setColor(Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.materialColorTertiaryContainer));
circlePaint.setColor(context.getColor(
com.android.internal.R.color.materialColorTertiaryContainer));
circlePaint.setFlags(Paint.ANTI_ALIAS_FLAG);
canvas.drawCircle(diameter / 2f, diameter / 2f, diameter / 2f, circlePaint);
Paint textPaint = new Paint();
textPaint.setColor(Utils.getColorAttrDefaultColor(context,
com.android.internal.R.attr.materialColorOnTertiaryContainer));
textPaint.setColor(context.getColor(
com.android.internal.R.color.materialColorOnTertiaryContainer));
textPaint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
textPaint.setTextAlign(Paint.Align.LEFT);
textPaint.setTextSize(res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_text_size));
@@ -210,12 +204,24 @@ class IconUtil {
return new BitmapDrawable(context.getResources(), bitmap);
}
private static Drawable composeIconCircle(Resources res, @ColorInt int circleColor,
@Px int circleDiameterPx, Drawable icon, @ColorInt int iconColor, @Px int iconSizePx) {
return composeIconCircle(res, ColorStateList.valueOf(circleColor), circleDiameterPx, icon,
ColorStateList.valueOf(iconColor), iconSizePx);
}
private static Drawable composeIconCircle(Resources res, ColorStateList circleColor,
@Px int circleDiameterPx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
return composeIcons(res, new ShapeDrawable(new OvalShape()), circleColor, circleDiameterPx,
icon, iconColor, iconSizePx);
}
private static Drawable composeIcons(Resources res, Drawable outer, @ColorInt int outerColor,
@Px int outerSizePx, Drawable icon, @ColorInt int iconColor, @Px int iconSizePx) {
return composeIcons(res, outer, ColorStateList.valueOf(outerColor), outerSizePx, icon,
ColorStateList.valueOf(iconColor), iconSizePx);
}
private static Drawable composeIcons(Resources res, Drawable outer, ColorStateList outerColor,
@Px int outerSizePx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
Drawable background = mutateDrawable(res, outer);

3
src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
View File

@@ -148,7 +148,8 @@ class ZenModePrioritySendersPreferenceController
makeSelectorPreference(KEY_ANY,
R.string.zen_mode_from_anyone, null, mIsMessages, true);
makeSelectorPreference(KEY_NONE,
R.string.zen_mode_none_messages, null, mIsMessages, true);
mIsMessages ? R.string.zen_mode_none_messages : R.string.zen_mode_none_calls,
null, mIsMessages, true);
}
super.displayPreference(screen);
}

81
src/com/android/settings/widget/MainSwitchBarPreference.kt
View File

@@ -17,6 +17,8 @@
package com.android.settings.widget
import android.content.Context
import android.os.Parcel
import android.os.Parcelable
import android.widget.CompoundButton
import android.widget.CompoundButton.OnCheckedChangeListener
import androidx.preference.TwoStatePreference
@@ -26,26 +28,32 @@ import com.android.settingslib.widget.MainSwitchBar
/** Preference abstraction of the [MainSwitchBar] in settings activity. */
class MainSwitchBarPreference(context: Context, private val metadata: MainSwitchBarMetadata) :
TwoStatePreference(context), OnCheckedChangeListener {
TwoStatePreference(context), OnCheckedChangeListener, MainSwitchBar.PreChangeListener {
private val mainSwitchBar: MainSwitchBar = (context as SettingsActivity).switchBar
// main switch bar might be null when configuration is just changed
private val mainSwitchBar: MainSwitchBar?
get() = (context as SettingsActivity).switchBar
override fun setTitle(title: CharSequence?) {
mainSwitchBar.setTitle(title)
mainSwitchBar?.setTitle(title)
super.setTitle(title)
}
override fun setSummary(summary: CharSequence?) {
mainSwitchBar.setSummary(summary)
mainSwitchBar?.setSummary(summary)
super.setSummary(summary)
}
override fun setEnabled(enabled: Boolean) {
mainSwitchBar.isEnabled = enabled
mainSwitchBar?.isEnabled = enabled
super.setEnabled(enabled)
}
// Preference.setVisible is final, we cannot override it
fun updateVisibility() {
// always make preference invisible, the UI visibility is reflected on MainSwitchBar
isVisible = false
val mainSwitchBar = mainSwitchBar ?: return
if ((metadata as? PreferenceAvailabilityProvider)?.isAvailable(context) != false) {
mainSwitchBar.show()
} else {
@@ -54,6 +62,7 @@ class MainSwitchBarPreference(context: Context, private val metadata: MainSwitch
}
override fun setChecked(checked: Boolean) {
val mainSwitchBar = mainSwitchBar ?: return
// remove listener to update UI only
mainSwitchBar.removeOnSwitchChangeListener(this)
mainSwitchBar.isChecked = checked
@@ -62,9 +71,13 @@ class MainSwitchBarPreference(context: Context, private val metadata: MainSwitch
override fun onAttached() {
super.onAttached()
val mainSwitchBar = mainSwitchBar!!
mainSwitchBar.setPreChangeListener(this)
mainSwitchBar.addOnSwitchChangeListener(this)
}
override fun preChange(isCheck: Boolean) = callChangeListener(isCheck)
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
// prevent user from toggling the switch before data store operation is done
isEnabled = false
@@ -73,7 +86,65 @@ class MainSwitchBarPreference(context: Context, private val metadata: MainSwitch
}
override fun onDetached() {
val mainSwitchBar = mainSwitchBar!!
mainSwitchBar.removeOnSwitchChangeListener(this)
mainSwitchBar.setPreChangeListener(null)
super.onDetached()
}
override fun onSaveInstanceState(): Parcelable =
SavedState(super.onSaveInstanceState()!!).also {
it.isEnabled = isEnabled
it.title = title
it.summary = summary
it.mainSwitchBarState = mainSwitchBar?.onSaveInstanceState()
}
override fun onRestoreInstanceState(state: Parcelable?) {
val savedState = state as SavedState
super.onRestoreInstanceState(savedState.superState)
isEnabled = savedState.isEnabled
title = savedState.title
summary = savedState.summary
mainSwitchBar?.onRestoreInstanceState(savedState.mainSwitchBarState!!)
}
private class SavedState : BaseSavedState {
var isEnabled: Boolean = false
var title: CharSequence? = null
var summary: CharSequence? = null
var mainSwitchBarState: Parcelable? = null
constructor(source: Parcel) : super(source) {
isEnabled = source.readBoolean()
title = source.readCharSequence()
summary = source.readCharSequence()
val stateClass = MainSwitchBar.SavedState::class.java
mainSwitchBarState = source.readParcelable(stateClass.classLoader, stateClass)
}
constructor(superState: Parcelable) : super(superState)
override fun writeToParcel(dest: Parcel, flags: Int) {
super.writeToParcel(dest, flags)
dest.writeBoolean(isEnabled)
dest.writeCharSequence(title)
dest.writeCharSequence(summary)
dest.writeParcelable(mainSwitchBarState, flags)
}
companion object {
@JvmField
val CREATOR: Parcelable.Creator<SavedState> =
object : Parcelable.Creator<SavedState> {
override fun createFromParcel(parcel: Parcel): SavedState {
return SavedState(parcel)
}
override fun newArray(size: Int): Array<SavedState?> {
return arrayOfNulls(size)
}
}
}
}
}

2
src/com/android/settings/widget/SettingsMainSwitchBar.java
View File

@@ -109,7 +109,7 @@ public class SettingsMainSwitchBar extends MainSwitchBar {
return true;
}
return mSwitch.performClick();
return callPreChangeListener() && mSwitch.performClick();
}
@Override

20
src/com/android/settings/wifi/WifiSwitchPreference.kt
View File

@@ -23,13 +23,12 @@ import android.content.IntentFilter
import android.net.wifi.WifiManager
import android.os.UserManager
import android.provider.Settings
import android.util.Log
import android.widget.Toast
import androidx.preference.Preference
import androidx.preference.Preference.OnPreferenceChangeListener
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.network.SatelliteRepository
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
import com.android.settings.network.SatelliteWarningDialogActivity
import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.WirelessUtils
@@ -42,8 +41,6 @@ import com.android.settingslib.metadata.ReadWritePermit
import com.android.settingslib.metadata.SensitivityLevel
import com.android.settingslib.metadata.SwitchPreference
import com.android.settingslib.preference.SwitchPreferenceBinding
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
// LINT.IfChange
class WifiSwitchPreference :
@@ -75,7 +72,7 @@ class WifiSwitchPreference :
val context = preference.context
// Show dialog and do nothing under satellite mode.
if (context.isSatelliteOn()) {
if (isSatelliteOn(context)) {
context.startActivity(
Intent(context, SatelliteWarningDialogActivity::class.java)
.putExtra(
@@ -100,7 +97,7 @@ class WifiSwitchPreference :
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
when {
(value == true && !context.isRadioAllowed()) || context.isSatelliteOn() ->
(value == true && !context.isRadioAllowed()) || isSatelliteOn(context) ->
ReadWritePermit.DISALLOW
else -> ReadWritePermit.ALLOW
}
@@ -155,22 +152,11 @@ class WifiSwitchPreference :
}
companion object {
const val TAG = "WifiSwitchPreference"
const val KEY = "main_toggle_wifi"
private fun Context.isRadioAllowed() =
WirelessUtils.isRadioAllowed(this, Settings.Global.RADIO_WIFI)
private fun Context.isSatelliteOn() =
try {
SatelliteRepository(this)
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS)
} catch (e: Exception) {
Log.e(TAG, "Error to get satellite status : $e")
false
}
private val Intent.wifiState
get() = getIntExtra(WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN)
}

19
tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
View File

@@ -208,7 +208,24 @@ public class AccessibilityHearingAidPreferenceControllerTest {
ShadowLooper.idleMainLooper();
assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
"TEST_HEARING_AID_BT_DEVICE_NAME / Left and right")).isTrue();
"TEST_HEARING_AID_BT_DEVICE_NAME active")).isTrue();
}
@Test
public void getSummary_connectedLeAudioHearingAidMonoSide_connectedSummary() {
when(mCachedBluetoothDevice.getDeviceSide()).thenReturn(
HearingAidInfo.DeviceSide.SIDE_MONO);
when(mCachedBluetoothDevice.getMemberDevice()).thenReturn(new HashSet<>());
when(mHapClientProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList());
mPreferenceController.onStart();
Intent intent = new Intent(BluetoothHapClient.ACTION_HAP_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHapClient.STATE_CONNECTED);
sendIntent(intent);
ShadowLooper.idleMainLooper();
assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
"TEST_HEARING_AID_BT_DEVICE_NAME active")).isTrue();
}
@Test

19
tests/robotests/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreferenceTest.kt → tests/robotests/src/com/android/settings/connecteddevice/BluetoothPreferenceTest.kt
View File

@@ -31,45 +31,42 @@ import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
@RunWith(AndroidJUnit4::class)
class BluetoothMainSwitchPreferenceTest {
class BluetoothPreferenceTest {
@get:Rule val setFlagsRule = SetFlagsRule()
private val context: Context = ApplicationProvider.getApplicationContext()
private lateinit var bluetoothAdapter: BluetoothAdapter
private lateinit var bluetoothMainSwitchPreference: BluetoothMainSwitchPreference
private lateinit var bluetoothPreference: BluetoothPreference
@Before
fun setUp() {
bluetoothAdapter = spy(BluetoothAdapter.getDefaultAdapter())
whenever(bluetoothAdapter.state).thenReturn(BluetoothAdapter.STATE_ON)
bluetoothMainSwitchPreference = BluetoothMainSwitchPreference(bluetoothAdapter)
bluetoothPreference =
BluetoothPreference(BluetoothPreference.createDataStore(context, bluetoothAdapter))
}
@Test
fun isEnabled_bluetoothOn_returnTrue() {
assertThat(bluetoothMainSwitchPreference.isEnabled(context)).isTrue()
assertThat(bluetoothPreference.isEnabled(context)).isTrue()
}
@Test
fun isEnabled_bluetoothTurningOn_returnFalse() {
whenever(bluetoothAdapter.state).thenReturn(BluetoothAdapter.STATE_TURNING_ON)
assertThat(bluetoothMainSwitchPreference.isEnabled(context)).isFalse()
assertThat(bluetoothPreference.isEnabled(context)).isFalse()
}
@Test
fun storageSetOff_turnOff() {
bluetoothMainSwitchPreference
.storage(context)
.setBoolean(bluetoothMainSwitchPreference.key, false)
bluetoothPreference.storage(context).setBoolean(bluetoothPreference.key, false)
verify(bluetoothAdapter).disable()
}
@Test
fun storageSetOn_turnOn() {
bluetoothMainSwitchPreference
.storage(context)
.setBoolean(bluetoothMainSwitchPreference.key, true)
bluetoothPreference.storage(context).setBoolean(bluetoothPreference.key, true)
verify(bluetoothAdapter).enable()
}