Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21a04a3d authored by Youming Ye's avatar Youming Ye Committed by Gerrit Code Review
Browse files

Merge "Change UI to be consistency with dialer settings light M2 theme"

parents 4ed93799 0e692705

res/values/colors.xml

+7 −8
Original line number Diff line number Diff line
@@ -15,17 +15,16 @@ 
  -->



<resources>

    <!--follows the dialer theme color-->

    <color name="theme_color">#2a56c6</color>

    <color name="background_color">#fafafa</color>



    <color name="dialer_settings_actionbar_text_color">#ffffff</color>

    <color name="dialer_settings_actionbar_background_color">@color/theme_color</color>

    <color name="dialer_settings_color_dark">#1c3aa9</color>



    <color name="blocked_numbers_divider_color">#e5e5e5</color>

    <color name="blocked_numbers_butter_bar_color">#f5f5f5</color>

    <color name="blocked_numbers_title_text_color">#ba000000</color>

    <color name="blocked_numbers_secondary_text_color">#89000000</color>

    <!--Use the one consistence with dialer-->

    <color name="blocked_numbers_divider_color">#d8d8d8</color>

    <color name="blocked_numbers_primary_text_color">#202124</color>

    <color name="blocked_numbers_secondary_text_color">#5f6368</color>



    <!--follows dialer color-->

    <color name="notification_action_answer">#097138</color>

    <color name="notification_action_decline">#A52714</color>

</resources>

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
    <dimen name="blocked_numbers_dialog_padding">24dp</dimen>

    <dimen name="blocked_numbers_delete_icon_padding">12dp</dimen>

    <dimen name="blocked_numbers_progress_bar_padding">100dp</dimen>

    <dimen name="blocked_numbers_font_size">16sp</dimen>

    <dimen name="blocked_numbers_head1_font_size">18sp</dimen>

    <dimen name="blocked_numbers_primary2_font_size">16sp</dimen>

    <dimen name="blocked_numbers_secondary_font_size">14sp</dimen>

    <dimen name="blocked_numbers_line_spacing">8sp</dimen>

    <dimen name="blocked_numbers_secondary_line_spacing">6sp</dimen>

res/values/styles.xml

+27 −19
Original line number Diff line number Diff line
@@ -26,58 +26,66 @@ 
    </style>



    <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.Material.Light">

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>

        <item name="android:colorPrimaryDark">@color/dialer_settings_color_dark</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>

        <item name="android:colorPrimaryDark">@color/background_color</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:navigationBarColor">@color/background_color</item>

        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.Material.Light">

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>

        <item name="android:colorPrimaryDark">@color/dialer_settings_color_dark</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>

        <item name="android:colorPrimaryDark">@color/background_color</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:navigationBarColor">@color/background_color</item>

        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:colorAccent">@color/theme_color</item>

        <item name="android:listDivider">@null</item>

    </style>



    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.Material.ActionBar">

        <item name="android:background">@color/dialer_settings_actionbar_background_color</item>

        <item name="android:titleTextStyle">@style/TelecomDialerSettingsActionBarTitleText</item>

        <item name="android:background">@color/background_color</item>

        <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>

        <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>

        <!-- Empty icon -->

        <item name="android:icon">@android:color/transparent</item>

    </style>



    <style name="TelecomDialerSettingsActionBarTitleText"

            parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">

        <item name="android:textColor">@color/dialer_settings_actionbar_text_color</item>

    </style>



    <style name="TelecomDialerSettingsActionOverflowButtonStyle"

            parent="@android:style/Widget.Material.Light.ActionButton.Overflow">

        <item name="android:src">@drawable/ic_more_vert_24dp</item>

    </style>



    <style name="BlockedNumbersButton">

    <style name="BlockedNumbersButton" parent="BlockedNumbersTextPrimary2">

        <item name="android:textColor">@color/theme_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_font_size</item>

        <item name="android:textAllCaps">true</item>

    </style>



    <style name="BlockedNumbersText">

        <item name="android:textSize">@dimen/blocked_numbers_font_size</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item>

    <style name="BlockedNumbersTextHead1"

           parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">

        <item name="android:textColor">@color/blocked_numbers_primary_text_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_head1_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

    </style>



    <style name="BlockedNumbersTitleText"  parent="BlockedNumbersText">

        <item name="android:textColor">@color/blocked_numbers_title_text_color</item>

    <style name="BlockedNumbersTextPrimary2">

        <item name="android:textColor">@color/blocked_numbers_primary_text_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_primary2_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item>

    </style>



    <style name="BlockedNumbersSecondaryText">

    <style name="BlockedNumbersTextSecondary">

        <item name="android:textColor">@color/blocked_numbers_secondary_text_color</item>

        <item name="android:textSize">@dimen/blocked_numbers_secondary_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item>

    </style>

</resources>

res/xml/activity_blocked_numbers.xml

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
                    android:paddingTop="@dimen/blocked_numbers_large_padding"

                    android:paddingLeft="@dimen/blocked_numbers_large_padding"

                    android:paddingRight="@dimen/blocked_numbers_large_padding"

                    style="@style/BlockedNumbersTitleText"

                    style="@style/BlockedNumbersTextPrimary2"

                    android:visibility="gone" />



            <LinearLayout
@@ -70,7 +70,7 @@ 
                            android:layout_height="wrap_content"

                            android:text="@string/blocked_numbers_msg"

                            android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"

                            style="@style/BlockedNumbersTitleText" />

                            style="@style/BlockedNumbersTextPrimary2" />



                    <TextView

                            android:id="@+id/add_blocked"

res/xml/add_blocked_number_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:gravity="center"

        android:padding="@dimen/blocked_numbers_dialog_padding">

    <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/add_blocked_dialog_body"

            android:paddingBottom="@dimen/blocked_numbers_large_padding"

            style="@style/BlockedNumbersTitleText" />

            style="@style/BlockedNumbersTextPrimary2" />

    <EditText

            android:id="@+id/add_blocked_number"

            android:layout_width="match_parent"