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

Commit fe9f1b08 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move values-w230dp-h220dp to values/" into ub-calculator-euler

parents e7c3232a 5e839a2b

res/values-w230dp-h220dp/dimens.xml

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

<!--

  Copyright (C) 2016 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>

    <!-- Dimens for display formula. -->

    <dimen name="formula_padding_top">0dip</dimen>

    <dimen name="formula_padding_bottom">8dip</dimen>

    <dimen name="formula_padding_start">16dip</dimen>

    <dimen name="formula_padding_end">16dip</dimen>

    <dimen name="formula_min_textsize">28dip</dimen>

    <dimen name="formula_max_textsize">28dip</dimen>

    <dimen name="formula_step_textsize">8dip</dimen>



    <!-- Dimens for display result. -->

    <dimen name="result_padding_top">0dip</dimen>

    <dimen name="result_padding_bottom">8dip</dimen>

    <dimen name="result_padding_start">16dip</dimen>

    <dimen name="result_padding_end">16dip</dimen>

    <dimen name="result_textsize">28dip</dimen>

</resources>
 
 No newline at end of file

res/values-w230dp-h220dp/styles.xml

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

<!--

  Copyright (C) 2016 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="PadButtonStyle.Advanced">

        <item name="android:background">@drawable/pad_button_advanced_background</item>

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

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

    </style>



    <style name="PadButtonStyle.Advanced.Text">

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

        <item name="android:textSize">12dip</item>

    </style>



    <style name="PadButtonStyle.Numeric">

        <item name="android:textSize">16dip</item>

    </style>



    <style name="PadButtonStyle.Numeric.Equals">

        <item name="android:visibility">visible</item>

    </style>



    <style name="PadButtonStyle.Operator">

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

    </style>



    <style name="PadButtonStyle.Operator.Text">

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

        <item name="android:textSize">12dip</item>

    </style>



    <style name="PadLayoutStyle.Advanced">

        <item name="android:elevation">4dip</item>

        <item name="android:paddingTop">2dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">18dip</item>

        <item name="android:paddingEnd">18dip</item>

    </style>



    <style name="PadLayoutStyle.Numeric">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">7</item>

        <item name="android:paddingTop">2dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">8dip</item>

        <item name="android:paddingEnd">8dip</item>

    </style>



    <style name="PadLayoutStyle.Operator">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">3</item>

        <item name="android:paddingTop">2dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">4dip</item>

        <item name="android:paddingEnd">28dip</item>

    </style>



</resources>

res/values/dimens.xml

+17 −1
Original line number Diff line number Diff line
@@ -25,4 +25,20 @@ 
    <dimen name="history_item_text_padding_top">8dip</dimen>

    <dimen name="history_item_text_padding_bottom">16dip</dimen>



    <!-- Dimens for display formula. -->

    <dimen name="formula_padding_top">0dip</dimen>

    <dimen name="formula_padding_bottom">8dip</dimen>

    <dimen name="formula_padding_start">16dip</dimen>

    <dimen name="formula_padding_end">16dip</dimen>

    <dimen name="formula_min_textsize">28dip</dimen>

    <dimen name="formula_max_textsize">28dip</dimen>

    <dimen name="formula_step_textsize">8dip</dimen>



    <!-- Dimens for display result. -->

    <dimen name="result_padding_top">0dip</dimen>

    <dimen name="result_padding_bottom">8dip</dimen>

    <dimen name="result_padding_start">16dip</dimen>

    <dimen name="result_padding_end">16dip</dimen>

    <dimen name="result_textsize">28dip</dimen>



</resources>
 
 No newline at end of file

res/values/styles.xml

+54 −0
Original line number Diff line number Diff line
@@ -74,9 +74,63 @@ 
        <item name="layout_columnWeight">1</item>

    </style>



    <style name="PadButtonStyle.Advanced">

        <item name="android:background">@drawable/pad_button_advanced_background</item>

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

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

    </style>



    <style name="PadButtonStyle.Advanced.Text">

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

        <item name="android:textSize">12dip</item>

    </style>



    <style name="PadButtonStyle.Numeric">

        <item name="android:textSize">16dip</item>

    </style>



    <style name="PadButtonStyle.Numeric.Equals">

        <item name="android:visibility">visible</item>

    </style>



    <style name="PadButtonStyle.Operator">

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

    </style>



    <style name="PadButtonStyle.Operator.Text">

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

        <item name="android:textSize">12dip</item>

    </style>



    <style name="PadLayoutStyle">

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

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

    </style>



    <style name="PadLayoutStyle.Advanced">

        <item name="android:elevation">4dip</item>

        <item name="android:paddingTop">2dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">18dip</item>

        <item name="android:paddingEnd">18dip</item>

    </style>



    <style name="PadLayoutStyle.Numeric">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">7</item>

        <item name="android:paddingTop">2dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">8dip</item>

        <item name="android:paddingEnd">8dip</item>

    </style>



    <style name="PadLayoutStyle.Operator">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">3</item>

        <item name="android:paddingTop">2dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">4dip</item>

        <item name="android:paddingEnd">28dip</item>

    </style>



</resources>