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

Commit 26e159eb authored by Annie Chin's avatar Annie Chin
Browse files

Calculator multiwindow support. 

Bug: 27906424
Change-Id: I9b9bf40be9909ce5def5762e69a21dd1ff94075b
parent f1b61f4f

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.calculator2">



    <supports-screens android:requiresSmallestWidthDp="230" />



    <application

        android:allowBackup="false"

        android:icon="@mipmap/ic_launcher_calculator"
@@ -42,5 +44,4 @@ 
            android:theme="@style/Theme.Licenses" />



    </application>



</manifest>

res/layout/activity_calculator_land.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:layout_weight="1">



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

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

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

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



    </LinearLayout>

res/layout/activity_calculator_port.xml

+3 −6
Original line number Diff line number Diff line
@@ -21,16 +21,13 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <include

        layout="@layout/display"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />

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



    <com.android.calculator2.CalculatorPadViewPager

        android:id="@+id/pad_pager"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:layout_weight="2"

        android:overScrollMode="never">



        <LinearLayout
@@ -38,7 +35,7 @@ 
            android:layout_height="match_parent">



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

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

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



        </LinearLayout>

res/layout/activity_calculator_tablet_port.xml

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

    android:orientation="vertical">



    <include

        layout="@layout/display"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />

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



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

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



    <LinearLayout style="@style/PadLinearLayoutStyle">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="500">



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

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

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



    </LinearLayout>

res/layout/display_one_line.xml

0 → 100644
+69 −0
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.

  -->



<com.android.calculator2.CalculatorDisplay

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

    android:id="@+id/display"

    style="@style/DisplayLayoutStyle"

    android:background="@color/display_background_color"

    android:clipChildren="false"

    android:elevation="4dip"

    android:orientation="vertical">



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



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <com.android.calculator2.CalculatorScrollView

            android:id="@+id/formula_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom"

            android:overScrollMode="never"

            android:scrollbars="none">



            <com.android.calculator2.CalculatorText

                android:id="@+id/formula"

                style="@style/DisplayTextStyle.Formula"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="bottom|end"

                android:ellipsize="none"

                android:gravity="bottom|end"

                android:longClickable="true"

                android:singleLine="true"

                android:textColor="@color/display_formula_text_color"

                android:textIsSelectable="false" />



        </com.android.calculator2.CalculatorScrollView>



        <com.android.calculator2.CalculatorResult

            android:id="@+id/result"

            style="@style/DisplayTextStyle.Result"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom"

            android:bufferType="spannable"

            android:singleLine="true"

            android:textColor="@color/display_result_text_color"

            android:visibility="invisible" />



    </FrameLayout>



</com.android.calculator2.CalculatorDisplay>