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

Commit 1f34b517 authored by Tony Huang's avatar Tony Huang Committed by android-build-merger
Browse files

Merge "Update dialog UI and search view hint font" into qt-dev 

am: 71513f91

Change-Id: I7930f142c396297e247f29c2a0d4c0aeb6526a7c
parents 0ebf6e7b 71513f91

res/values-night/styles.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 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.

-->



<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <style name="BottomSheetDialogStyle" parent="@style/Theme.MaterialComponents.BottomSheetDialog">

        <item name="android:colorBackground">@color/app_background_color</item>

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

        <item name="android:windowIsFloating">false</item>

        <item name="bottomSheetStyle">@style/BottomSheet</item>

        <item name="colorControlHighlight">@color/ripple_material_dark</item>

    </style>

</resources>

res/values-night/themes.xml

+0 −25
Original line number Diff line number Diff line
@@ -41,29 +41,4 @@ 
        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>



    </style>



    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.NoActionBar">



        <!-- This only used by support lib, not allow to overlay -->

        <item name="windowActionBar">false</item>

        <item name="windowActionModeOverlay">true</item>



        <!-- For material design widget, chips, buttons, not support attr-->

        <item name="colorPrimary">@color/primary</item>

        <item name="colorAccent">@color/primary</item>



        <item name="gridItemTint">@color/item_doc_grid_tint</item>



        <item name="actionBarTheme">@style/ActionBarTheme</item>

        <item name="actionModeStyle">@style/ActionModeStyle</item>

        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>

        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>

        <item name="alertDialogTheme">@style/AlertDialogTheme</item>

        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>

        <item name="materialButtonStyle">@style/MaterialButton</item>

        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>

        <item name="materialCardViewStyle">@style/CardViewStyle</item>

        <item name="queryBackground">@color/menu_search_background</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>

    </style>

</resources>

res/values/styles.xml

+18 −5
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ 
        <item name="android:textColor">?android:colorPrimary</item>

    </style>



    <style name="BottomSheetDialogStyle" parent="@Theme.MaterialComponents.Light.BottomSheetDialog">

        <item name="android:colorBackground">@color/app_background_color</item>

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

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

        <item name="android:navigationBarColor">?android:attr/colorBackground</item>

    <style name="AutoCompleteTextViewStyle" parent="@style/Widget.AppCompat.AutoCompleteTextView">

        <item name="android:textAppearance">@style/AutoCompleteText</item>

    </style>



    <style name="BottomSheetDialogStyle" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">

        <item name="android:windowIsFloating">false</item>

        <item name="bottomSheetStyle">@style/BottomSheet</item>

        <item name="colorControlHighlight">@color/ripple_material_light</item>
@@ -68,6 +68,12 @@ 
        <item name="android:overlapAnchor">false</item>

    </style>



    <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked">

        <item name="android:textColor">?attr/colorOnSurface</item>

        <item name="android:textSize">20sp</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">

        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>

    </style>
@@ -84,4 +90,11 @@ 
        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>

        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>

    </style>



    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">

        <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>

        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>

        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>

        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleStyle</item>

    </style>

</resources>

res/values/styles_text.xml

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


    <style name="SortList" parent="@style/TextAppearance.AppCompat.Subhead">

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

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="SearchBarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
@@ -40,6 +41,10 @@ 
        <item name="fontFamily">@string/config_fontFamily</item>

    </style>



    <style name="AutoCompleteText" parent="@style/TextAppearance.AppCompat.Medium">

        <item name="fontFamily">@string/config_fontFamily</item>

    </style>



    <style name="CardPrimaryText" parent="@style/TextAppearance.AppCompat.Subhead">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">14sp</item>

res/values/themes.xml

+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


    </style>



    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.Light.NoActionBar">

    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">



        <!-- This only used by support lib, not allow to overlay -->

        <item name="windowActionBar">false</item>
@@ -64,10 +64,12 @@ 
        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>

        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>

        <item name="alertDialogTheme">@style/AlertDialogTheme</item>

        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>

        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>

        <item name="materialButtonStyle">@style/MaterialButton</item>

        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>

        <item name="materialCardViewStyle">@style/CardViewStyle</item>

        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>

        <item name="queryBackground">@color/menu_search_background</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>

    </style>