WORK_AREA - fix work area buttons and labels

This commit is contained in:
Alex Sim committed 2026-03-19 22:56:00 +01:00
1 parent abbe81a6fa
commit 7a5226099a
15 files changed
+32 -13

No files matched your search

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/settingslib_materialColorPrimaryInverse" android:alpha="0.5"/>
</selector>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/settingslib_materialColorPrimaryInverse" android:alpha="0.75"/>
</selector>
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/all_apps_label_text_color_inverse" android:state_selected="true"/>
<item android:color="@color/all_apps_label_text_color"/>
</selector>
@@ -21,7 +21,7 @@
android:top="@dimen/all_apps_tabs_focus_vertical_inset">
<shape android:shape="rectangle">
<corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
<solid android:color="@color/materialColorPrimary" />
<solid android:color="@color/settingslib_materialColorPrimary" />
</shape>
</item>
</layer-list>
@@ -21,7 +21,7 @@
android:top="@dimen/all_apps_tabs_focus_vertical_inset">
<shape android:shape="rectangle">
<corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
<solid android:color="@color/materialColorSurfaceBright" />
<solid android:color="@color/all_apps_tabs_bg_color" />
</shape>
</item>
</layer-list>
@@ -26,7 +26,7 @@
<corners android:radius="@dimen/rounded_button_radius" />
<stroke
android:width="@dimen/work_apps_paused_button_stroke"
android:color="@color/work_turn_on_stroke" />
android:color="@color/settingslib_materialColorPrimary" />
</shape>
</item>
</ripple>
+2 -2
View File
@@ -21,10 +21,10 @@
android:insetRight="@dimen/inset_rounded_action_button">
<shape
android:shape="rectangle">
<solid android:color="@color/materialColorSurfaceContainerLow" />
<solid android:color="@color/settingslib_primary_inverse_a50" />
<corners android:radius="@dimen/rounded_button_radius" />
<stroke
android:width="1dp"
android:color="@color/materialColorSurfaceContainerLow" />
android:color="@color/settingslib_primary_inverse_a75" />
</shape>
</inset>
+1 -1
View File
@@ -18,7 +18,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/work_fab_radius" />
<solid android:color="@color/all_apps_tab_background_selected" />
<solid android:color="@color/settingslib_materialColorPrimary" />
<padding
android:left="@dimen/work_profile_footer_padding"
android:right="@dimen/work_profile_footer_padding" />
+1 -1
View File
@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/materialColorSurfaceContainerHighest" />
<solid android:color="@color/all_apps_tabs_bg_color" />
<corners android:radius="@dimen/work_edu_card_radius" />
</shape>
+2 -2
View File
@@ -35,7 +35,7 @@
android:background="@drawable/all_apps_tabs_background"
android:text="@string/all_apps_personal_tab"
android:contentDescription="@string/all_apps_personal_tab_content_description"
android:textColor="@color/all_apps_tab_text"
android:textColor="@color/murine_all_apps_tab_text"
android:textSize="14sp"
style="?android:attr/borderlessButtonStyle" />
@@ -48,7 +48,7 @@
android:background="@drawable/all_apps_tabs_background"
android:text="@string/all_apps_work_tab"
android:contentDescription="@string/all_apps_work_tab_content_description"
android:textColor="@color/all_apps_tab_text"
android:textColor="@color/murine_all_apps_tab_text"
android:textSize="14sp"
style="?android:attr/borderlessButtonStyle" />
</com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
+1 -1
View File
@@ -31,7 +31,7 @@
android:id="@+id/wrapper">
<TextView
style="@style/PrimaryHeadline"
android:textColor="?android:attr/textColorPrimary"
android:textColor="@color/all_apps_label_text_color"
android:id="@+id/work_apps_paused_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
+3 -3
View File
@@ -21,7 +21,7 @@
<TextView
style="@style/PrimaryHeadline"
android:textColor="?android:attr/textColorPrimary"
android:textColor="@color/settingslib_materialColorOnSurface"
android:id="@+id/work_apps_paused_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/work_apps_paused_content"
android:textColor="?android:attr/textColorSecondary"
android:textColor="@color/all_apps_label_text_color"
android:text="@string/work_apps_paused_body"
android:textAlignment="center"
android:layout_marginTop="16dp"
@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/rounded_button_height"
android:id="@+id/enable_work_apps"
android:textColor="?android:attr/textColorPrimary"
android:textColor="@color/all_apps_label_text_color"
android:text="@string/work_apps_enable_btn_text"
android:textAlignment="center"
android:background="@drawable/bg_work_apps_paused_action_button"
+2
View File
@@ -69,6 +69,8 @@
<color name="materialColorError">@color/system_error_dark</color>
<color name="all_apps_label_text_color">#E9E2E2</color>
<color name="all_apps_label_text_color_inverse">#2F2E2A</color>
<color name="all_apps_search_bg_color">#14FFFFFF</color>
<color name="all_apps_search_border_color">#22FFFFFF</color>
<color name="all_apps_tabs_bg_color">#19FFFFFF</color>
</resources>
+2
View File
@@ -315,8 +315,10 @@
<color name="all_apps_blur_overlay_color">#80FFFFFF</color>
<color name="all_apps_label_text_color">#2F2E2A</color>
<color name="all_apps_label_text_color_inverse">#E9E2E2</color>
<color name="all_apps_search_bg_color">#14000000</color>
<color name="all_apps_search_border_color">#22000000</color>
<color name="all_apps_tabs_bg_color">#19000000</color>
<!-- Murine search bar colors (light) -->
<color name="murine_search_container_color">@color/settingslib_materialColorSurfaceContainerHigh</color>
@@ -104,6 +104,8 @@ constructor(
)
}
// Load string cache at least once
UI_HELPER_EXECUTOR.execute { model.modelDelegate.loadStringCache(model.bgDataModel.stringCache) }
// Device profile policy changes
val dpUpdateReceiver =
SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR) { model.reloadStringCache() }