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

Commit 85e8e6c4 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Simplify layouts 

Change-Id: I3f62e92335d9914ecb8c04e646348d8f47757f4a
parent 526bb508

res/layout/activity_calculator_land.xml→res/layout-land/activity_calculator.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

  Copyright (C) 2014 The Android Open Source Project

    SPDX-FileCopyrightText: 2023 The LineageOS Project



    SPDX-License-Identifier: Apache-2.0

  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.

-->

-->



<LinearLayout

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"
@@ -22,7 +10,7 @@ 
    android:orientation="vertical">

    android:orientation="vertical">





    <include

    <include

        layout="@layout/display"

        layout="@layout/display_one_line"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />

        android:layout_height="wrap_content" />
@@ -31,9 +19,9 @@ 
        android:layout_height="0dip"

        android:layout_height="0dip"

        android:layout_weight="100">

        android:layout_weight="100">





        <include layout="@layout/pad_advanced" />

        <include layout="@layout/pad_advanced_3x4" />

        <include layout="@layout/pad_numeric" />

        <include layout="@layout/pad_numeric" />

        <include layout="@layout/pad_operator" />

        <include layout="@layout/pad_operator_two_col" />





    </LinearLayout>

    </LinearLayout>

res/layout/activity_calculator_port.xml→res/layout/activity_calculator.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -21,9 +21,9 @@ 
    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical">





    <include layout="@layout/display" />

    <include layout="@layout/display_two_line" />





    <include layout="@layout/pad_advanced" />

    <include layout="@layout/pad_advanced_4x3" />





    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"
@@ -31,7 +31,7 @@ 
        android:orientation="vertical"

        android:orientation="vertical"

        android:layout_weight="225">

        android:layout_weight="225">





        <include layout="@layout/pad_operator_aux" />

        <include layout="@layout/pad_operator_one_col_aux" />





        <LinearLayout

        <LinearLayout

            android:layout_width="fill_parent"

            android:layout_width="fill_parent"
@@ -39,7 +39,7 @@ 
            android:layout_weight="750">

            android:layout_weight="750">





            <include layout="@layout/pad_numeric"/>

            <include layout="@layout/pad_numeric"/>

            <include layout="@layout/pad_operator" />

            <include layout="@layout/pad_operator_one_col" />

        </LinearLayout>

        </LinearLayout>

      </LinearLayout>

      </LinearLayout>

</LinearLayout>
 
</LinearLayout>

res/values-land/layout.xml

deleted100644 → 0
+0 −23
Original line number Original line 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>

    <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item>

    <item name="display" type="layout">@layout/display_one_line</item>

    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x4</item>

    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>

</resources>

res/values-sw600dp-land/layout.xml

deleted100644 → 0
+0 −23
Original line number Original line 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>

    <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item>

    <item name="display" type="layout">@layout/display_two_line</item>

    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x4</item>

    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>

</resources>

res/values-sw600dp/layout.xml

deleted100644 → 0
+0 −24
Original line number Original line 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>

    <item name="activity_calculator" type="layout">@layout/activity_calculator_port</item>

    <item name="display" type="layout">@layout/display_two_line</item>

    <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>

    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>

    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>

</resources>