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

Commit 6c8c0777 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Show popup for aggregation suggestion 

- create ListPopupWindow instead of embedding Views into
  the base layout.
- refrain AggregationSuggestionView from having focusable and
  clickable capability, which will be automatically supplied from
  ListView
- tweak layout xmls to show ListPopupWindow correctly. Include
  some pixel-perfect designs

Bug: 5057400
Change-Id: I9ec8642c0864204747ee445da7ee0292171a8788
parent 8ebfa3d1

res/layout-sw580dp/aggregation_suggestions_item.xml

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

<!--

/*

 * Copyright 2010, 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.

 */

-->



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

    class="com.android.contacts.editor.AggregationSuggestionView"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:paddingLeft="5dip"

    android:paddingRight="15dip"

    android:background="?android:attr/selectableItemBackground"

    android:focusable="true"

>

    <ImageView

        android:id="@+id/aggregation_suggestion_photo"

        android:layout_width="@dimen/aggregation_suggestion_icon_size"

        android:layout_height="@dimen/aggregation_suggestion_icon_size"

        android:layout_alignParentLeft="true"

        android:layout_centerInParent="true"

        android:layout_marginTop="4dip"

        android:scaleType="fitCenter"

    />



    <TextView

        android:id="@+id/aggregation_suggestion_name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/aggregation_suggestion_photo"

        android:layout_marginLeft="10dip"

        android:layout_marginTop="4dip"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:textColor="?android:attr/textColorSecondary"

    />



    <TextView

        android:id="@+id/aggregation_suggestion_data"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/aggregation_suggestion_photo"

        android:layout_below="@id/aggregation_suggestion_name"

        android:layout_marginLeft="10dip"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary"

    />

</view>

res/layout/aggregation_suggestions_item.xml

+25 −33
Original line number Diff line number Diff line
@@ -21,42 +21,34 @@ 
    class="com.android.contacts.editor.AggregationSuggestionView"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:paddingLeft="5dip"

    android:paddingRight="15dip"

    android:minHeight="48dip"

    android:paddingLeft="8dip"

    android:background="?android:attr/selectableItemBackground"

    android:focusable="true"

>



    <ImageView

        android:id="@+id/aggregation_suggestion_photo"

        android:layout_width="@dimen/aggregation_suggestion_icon_size"

        android:layout_height="@dimen/aggregation_suggestion_icon_size"

        android:layout_alignParentLeft="true"

        android:layout_centerInParent="true"

        android:layout_marginTop="4dip"

        android:scaleType="fitCenter"

    />

    android:orientation="horizontal">



    <LinearLayout

        android:layout_width="0px"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:layout_gravity="center_vertical">

        <TextView

            android:id="@+id/aggregation_suggestion_name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:layout_toRightOf="@id/aggregation_suggestion_photo"

        android:layout_marginLeft="10dip"

        android:layout_marginTop="4dip"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

    />



            android:textAppearance="?android:attr/textAppearanceMedium" />

        <TextView

            android:id="@+id/aggregation_suggestion_data"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:layout_toRightOf="@id/aggregation_suggestion_photo"

        android:layout_below="@id/aggregation_suggestion_name"

        android:layout_marginLeft="10dip"

            android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

    />

            android:textColor="?android:attr/textColorSecondary" />

    </LinearLayout>



    <ImageView

        android:id="@+id/aggregation_suggestion_photo"

        android:layout_width="48dip"

        android:layout_height="48dip"

        android:scaleType="fitCenter"

        android:layout_gravity="center_vertical" />

</view>

res/layout/edit_field_list_with_anchor_view.xml

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

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

-->



<!-- Layout that behaves similarly to edit_field_list.xml,

     but also has an anchor view for ListPopupWindow -->

<LinearLayout

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

    android:layout_width="0dip"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:paddingLeft="@dimen/editor_field_left_padding"

    android:orientation="vertical">

    <LinearLayout

         android:id="@+id/editors"

         android:layout_width="match_parent"

         android:layout_height="wrap_content"

         android:orientation="vertical" />

    <View

         android:id="@+id/anchor_view"

         android:layout_width="match_parent"

         android:layout_height="0px" />

</LinearLayout>

res/layout/raw_contact_editor_view.xml

+0 −7
Original line number Diff line number Diff line
@@ -66,13 +66,6 @@ 


        </LinearLayout>



        <ViewStub android:id="@+id/aggregation_suggestion_stub"

            android:inflatedId="@+id/aggregation_suggestion"

            android:layout="@layout/aggregation_suggestions"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="visible"/>



        <LinearLayout

            android:id="@+id/sect_fields"

            android:layout_width="match_parent"

res/layout/structured_name_editor_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ 
        android:clickable="true">



        <include

            android:id="@+id/editors"

            layout="@layout/edit_field_list" />

            layout="@layout/edit_field_list_with_anchor_view" />



        <include

            android:id="@+id/expansion_view_container"