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

Commit 7c8ae387 authored by Mindy Pereira's avatar Mindy Pereira Committed by Android (Google) Code Review
Browse files

Merge "Additional ui changes for quick contact."

parents 85af8463 485b5af5

res/drawable/list_divider.xml

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

-->

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

    android:shape="rectangle">

    <solid

        android:color="@color/quickcontact_list_divider"/>

</shape>
 
 No newline at end of file

res/drawable/quickcontact_list_item_divider.xml

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

-->

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

    android:drawable="@drawable/list_divider"

    android:insetRight="16dp"

    android:insetLeft="16dp" />
 
 No newline at end of file

res/layout/quickcontact_list_item_website.xml→res/layout-land/quickcontact_list_fragment_bottom.xml

+18 −0
Original line number Diff line number Diff line
@@ -13,21 +13,6 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout

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

    android:id="@+id/actions_view_container"

    android:nextFocusRight="@+id/secondary_action_button"

    style="@style/QuickContactListItemStyle">

    <LinearLayout style="@style/QuickContactListItemTextWrapperStyle">

        <TextView

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textColor="@color/primary_text_color"

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

            android:ellipsize="middle"

            android:singleLine="true" />

    </LinearLayout>

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

</LinearLayout>
 
<View xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_alignParentBottom="true"

    style="@style/QuickContactListBottomStyle"/>

res/layout-sw580dp-w1000dp/quickcontact_list_fragment_bottom.xml

0 → 100755
+18 −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.

-->

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

    android:layout_alignBottom="@+id/list"

    style="@style/QuickContactListBottomStyle"/>

res/layout/quickcontact_activity.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
        android:layout_height="wrap_content"

        android:paddingLeft="15dip"

        android:paddingRight="15dip"

        android:paddingTop="8dip"

        android:orientation="vertical">

        <view

            class="com.android.contacts.widget.ProportionalLayout"
@@ -47,6 +48,6 @@ 
        <android.support.v4.view.ViewPager

            android:id="@+id/item_list_pager"

            android:layout_width="match_parent"

            android:layout_height="180dip" />

            android:layout_height="156dip" />

    </LinearLayout>

</view>