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

Commit be26cb27 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Fix searchbox font and other specs" into sc-dev

parents 360793ed 05d3e864

res/color/all_apps_tab_bg.xml

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

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

-->

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

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/colorAccentPrimary"/>

</selector>
 
 No newline at end of file

res/color/all_apps_tab_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
     limitations under the License.

-->

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

    <item android:color="?android:attr/textColorPrimaryInverse" android:state_selected="true"/>

    <item android:color="@android:color/black" android:state_selected="true"/>

    <item android:color="?android:attr/textColorTertiary"/>

</selector>
 
 No newline at end of file

res/drawable/all_apps_tabs_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
<shape android:shape="rectangle"

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <solid android:color="?androidprv:attr/colorSurfaceVariant" />

    <solid android:color="?androidprv:attr/colorSurface" />

    <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />

</shape>
 
 No newline at end of file

res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -91,14 +91,14 @@ 
    <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>

    <dimen name="all_apps_background_canvas_width">700dp</dimen>

    <dimen name="all_apps_background_canvas_height">475dp</dimen>

    <dimen name="all_apps_header_pill_height">50dp</dimen>

    <dimen name="all_apps_header_pill_corner_radius">48dp</dimen>

    <dimen name="all_apps_header_pill_height">36dp</dimen>

    <dimen name="all_apps_header_pill_corner_radius">18dp</dimen>

    <dimen name="all_apps_header_tab_height">48dp</dimen>

    <dimen name="all_apps_tabs_indicator_height">2dp</dimen>

    <dimen name="all_apps_header_top_padding">36dp</dimen>

    <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>

    <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>

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

    <dimen name="all_apps_tabs_side_padding">32dp</dimen>

    <dimen name="all_apps_divider_height">1dp</dimen>



    <dimen name="all_apps_tip_bottom_margin">8dp</dimen>

res/values/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -213,8 +213,7 @@ 
        <item name="disabledIconAlpha">.54</item>

    </style>





    <style name="BaseIconUnBounded" parent="@android:style/TextAppearance.DeviceDefault">

    <style name="BaseIconUnBounded" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_gravity">center</item>
@@ -272,7 +271,8 @@ 


    <style name="DropTargetButton" parent="DropTargetButtonBase" />



    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />

    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault" />



    <style name="PrimaryHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>



    <style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault" />