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

Commit 9d1c20d7 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Consolidate CallSubject history and dialog. 

- Removed CallSubjectHistory activity and put that functionality into
CallSubjectDialog.
- Changed CallSubjectDialog into an activity styled after a dialog.
- Although dialog_call_subject looks a lot different, the main change is
the addition of the subject_list above the dialog in the layout (I tried
having it below the dialog but I could not get the layout to work
properly).  A RelativeLayout was used so that when the subject history
list is shown, the dialog naturally moves up to fit the call history list.
- Added layout for the call subject history list items to give better
control of their appearance.
- This was to give better control of layout and make it possible to
animate between show/hide of call subject history.


Bug: 22685114
Change-Id: I7555bb09b86c50b52a76661f1460f4fe0e30bd97
parent 690f8735

res-common/drawable/dialog_background_material.xml

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

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

-->



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

    android:inset="16dp">

    <shape android:shape="rectangle">

        <corners android:radius="2dp" />

        <solid android:color="@color/call_subject_history_background" />

    </shape>

</inset>

res-common/layout/call_subject_history_list_item.xml

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

<!--

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

  -->



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

          android:id="@android:id/text1"

          android:gravity="center_vertical"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:paddingStart="@dimen/call_subject_dialog_margin"

          android:paddingEnd="@dimen/call_subject_dialog_margin"

          android:paddingTop="@dimen/call_subject_history_item_padding"

          android:paddingBottom="@dimen/call_subject_history_item_padding"

          android:singleLine="true"

          android:textColor="@color/dialtacts_primary_text_color"

          android:textSize="@dimen/call_subject_dialog_primary_text_size" />

res-common/layout/dialog_call_subject.xml

+120 −90
Original line number Diff line number Diff line
@@ -17,9 +17,28 @@ 


<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/transparent"

    android:id="@+id/call_subject_dialog"

    android:orientation="vertical">



    <RelativeLayout

        android:layout_height="0dp"

        android:layout_weight="1"

        android:layout_width="match_parent">



        <!-- The call subject dialog will be centered in the space above the subject list. -->

        <LinearLayout

            android:id="@+id/dialog_view"

            android:orientation="vertical"

            android:layout_width="match_parent"

    android:layout_height="wrap_content" >

            android:layout_height="wrap_content"

            android:clickable="true"

            android:theme="@android:style/Theme.Material.Light.Dialog"

            android:elevation="16dp"

            android:layout_centerInParent="true"

            android:background="@drawable/dialog_background_material">



            <LinearLayout

                android:layout_width="match_parent"
@@ -99,7 +118,6 @@ 
            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

        android:orientation="horizontal"

                android:layout_marginStart="@dimen/call_subject_dialog_margin"

                android:layout_marginEnd="@dimen/call_subject_dialog_margin"

                android:layout_marginTop="@dimen/call_subject_dialog_margin"
@@ -127,3 +145,15 @@ 


            </RelativeLayout>

        </LinearLayout>

    </RelativeLayout>

    <!-- The subject list is pinned to the bottom of the screen. -->

    <ListView

        android:id="@+id/subject_list"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_below="@id/dialog_view"

        android:background="@color/call_subject_history_background"

        android:divider="@null"

        android:elevation="8dp" />



</LinearLayout>
 
 No newline at end of file

res-common/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -159,4 +159,6 @@ 
    <dimen name="call_subject_dialog_primary_text_size">16sp</dimen>

    <!-- Size of secondary text in the call subject dialog. -->

    <dimen name="call_subject_dialog_secondary_text_size">14sp</dimen>

    <!-- Row padding for call subject history items. -->

    <dimen name="call_subject_history_item_padding">15dp</dimen>

</resources>

res-common/values/integers.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,4 +30,7 @@ 
    <!-- Layout weight of card in contact list view.

    Default to 0 to indicate no padding -->

    <integer name="contact_list_card_layout_weight">0</integer>



    <!-- Duration of the animations on the call subject dialog. -->

    <integer name="call_subject_animation_duration">250</integer>

</resources>