diff options
Diffstat (limited to 'java/com/android/dialer/main/impl/res')
3 files changed, 22 insertions, 5 deletions
diff --git a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml index 709de52b8..0edc03c3d 100644 --- a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml +++ b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml @@ -47,9 +47,7 @@ android:id="@+id/promotion_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" - android:textColor="#DD000000" - android:textSize="16sp" + style="@style/Dialer.TextAppearance.Header2" /> <TextView android:id="@+id/promotion_details" @@ -58,8 +56,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1.5" - android:textColor="#DD000000" - android:textSize="14sp"/> + style="@style/Dialer.TextAppearance.Secondary"/> <Button android:id="@+id/ok_got_it" android:layout_width="wrap_content" diff --git a/java/com/android/dialer/main/impl/res/values-v27/styles.xml b/java/com/android/dialer/main/impl/res/values-v27/styles.xml index 9462bbc25..261012ed5 100644 --- a/java/com/android/dialer/main/impl/res/values-v27/styles.xml +++ b/java/com/android/dialer/main/impl/res/values-v27/styles.xml @@ -24,4 +24,13 @@ <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item> <item name="android:navigationBarDividerColor">#E0E0E0</item> </style> + + <!-- Used on sdk 27 and above --> + <!-- TODO(a bug): refactor into dialer/theme --> + <style name="MainActivityTheme.Dark" parent="MainActivityThemeBase.Dark"> + <!-- Used to change the navigation bar color --> + <item name="android:windowLightNavigationBar">true</item> + <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item> + <item name="android:navigationBarDividerColor">#E0E0E0</item> + </style> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml index 467cb5be0..7b36e78ef 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -19,12 +19,23 @@ <!-- Activities should use this theme as their style --> <style name="MainActivityTheme" parent="MainActivityThemeBase"/> + <style name="MainActivityTheme.Dark" parent="MainActivityTheme.Dark"/> + <!-- Used as a procy for values-v27/styles.xml --> <style name="MainActivityThemeBase" parent="Dialer.ThemeBase.NoActionBar"> <!-- Required for actionmode/multiselect to render properly. --> <!-- TODO(a bug): Check to see if we can remove this after NewVoicemailFragment launches --> <item name="actionModeStyle">@style/MainActionModeStyle</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="dialpad_style">@style/Dialpad.Light</item> + </style> + + <style name="MainActivityThemeBase.Dark" parent="Dialer.Dark.ThemeBase.NoActionBar"> + <!-- Required for actionmode/multiselect to render properly. --> + <!-- TODO(a bug): Check to see if we can remove this after NewVoicemailFragment launches --> + <item name="actionModeStyle">@style/MainActionModeStyle</item> + <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="dialpad_style">@style/Dialpad.Light</item> </style> <!-- Colors our actionbar in action mode to dialer theme color. --> |