diff options
| author | 2022-08-16 17:47:18 +0000 | |
|---|---|---|
| committer | 2022-08-16 17:47:18 +0000 | |
| commit | 3fdedfa2b6ebf41fe53d4c33b848fdc6e8470fd6 (patch) | |
| tree | 4ced26b0bd76ae7ef9a8026e616ccd24c5358d7a | |
| parent | 9d16d9dacbd2e048a24b1077d1ac202689b00cb2 (diff) | |
| parent | 1a4688460b67f0f94ecd32dd682da4238ebddf76 (diff) | |
Merge "Side Fps Toast theme changes according to system theme." into tm-qpr-dev
| -rw-r--r-- | core/res/res/layout/side_fps_toast.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values-night/colors.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/core/res/res/layout/side_fps_toast.xml b/core/res/res/layout/side_fps_toast.xml index 58b8cc9438ae..96860b050393 100644 --- a/core/res/res/layout/side_fps_toast.xml +++ b/core/res/res/layout/side_fps_toast.xml @@ -20,13 +20,14 @@ android:layout_height="wrap_content" android:minWidth="350dp" android:layout_gravity="center" - android:theme="?attr/alertDialogTheme"> + android:background="@color/side_fps_toast_background"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/fp_power_button_enrollment_title" android:singleLine="true" android:ellipsize="end" + android:textColor="@color/side_fps_text_color" android:paddingLeft="20dp"/> <Space android:layout_width="wrap_content" @@ -39,5 +40,6 @@ android:text="@string/fp_power_button_enrollment_button_text" android:paddingRight="20dp" style="?android:attr/buttonBarNegativeButtonStyle" + android:textColor="@color/side_fps_button_color" android:maxLines="1"/> </LinearLayout>
\ No newline at end of file diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml index 33c9b95c5819..ffaccd3ddc57 100644 --- a/core/res/res/values-night/colors.xml +++ b/core/res/res/values-night/colors.xml @@ -37,4 +37,10 @@ <color name="user_icon_6">#ff4ecde6</color><!-- cyan --> <color name="user_icon_7">#fffbbc04</color><!-- yellow --> <color name="user_icon_8">#fffa903e</color><!-- orange --> + + <!-- Color for side fps toast dark theme--> + <color name="side_fps_toast_background">#2E3132</color> + <color name="side_fps_text_color">#EFF1F2</color> + <color name="side_fps_button_color">#33B9DB</color> + </resources> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 9fd894db4cfa..d5875f547e91 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -447,4 +447,10 @@ <!-- Color of camera light when camera is in use --> <color name="camera_privacy_light_day">#FFFFFF</color> <color name="camera_privacy_light_night">#FFFFFF</color> + + <!-- Color for side fps toast light theme --> + <color name="side_fps_toast_background">#F7F9FA</color> + <color name="side_fps_text_color">#191C1D</color> + <color name="side_fps_button_color">#00677E</color> + </resources> |