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

Commit e4f02ae2 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge commit 'android-4.2.2_r1' into mr1.1-staging 

Conflicts:
	res/layout/quickcontact_photo_container.xml
	res/values-bg/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values/strings.xml
	src/com/android/contacts/dialpad/DialpadFragment.java

Change-Id: I6b5a1b584fa17e6b75a6fe2a04b19661cc150513
parents dd44ad61 82bdbbfc

res/layout-sw580dp/quickcontact_activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
            android:background="@color/quickcontact_tab_indicator" />

        <android.support.v4.view.ViewPager

            android:id="@+id/item_list_pager"

            android:background="@color/quickcontact_list_background"

            android:layout_width="match_parent"

            android:layout_height="160dip" />

    </LinearLayout>

res/layout/dialtacts_custom_action_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
        android:paddingRight="4dip"

        android:layout_height="match_parent"

        android:layout_alignParentRight="true"

        android:contentDescription="@string/action_menu_overflow_description"

        android:importantForAccessibility="yes"

        android:src="@drawable/ic_menu_overflow"

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

        android:visibility="gone" />

res/layout/name_edit_expansion_view.xml

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

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

-->



<!-- "More" or "less" expansion button in the contact editor. -->



<FrameLayout

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

    android:layout_width="wrap_content"

    android:layout_height="@dimen/editor_min_line_item_height"

    android:layout_gravity="top"

    android:contentDescription="@string/expand_collapse_name_fields_description"

    android:importantForAccessibility="yes">

    <ImageView

        android:id="@+id/expansion_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:duplicateParentState="true"

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

        android:paddingLeft="@dimen/editor_round_button_padding_left"

        android:paddingRight="@dimen/editor_round_button_padding_right"

        android:paddingTop="@dimen/editor_round_button_padding_top"

        android:paddingBottom="@dimen/editor_round_button_padding_bottom" />

</FrameLayout>

res/layout/phonetic_name_editor_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


        <include

            android:id="@+id/expansion_view_container"

            layout="@layout/edit_expansion_view"

            layout="@layout/name_edit_expansion_view"

            android:visibility="gone" />



        <include

res/layout/quickcontact_photo_container.xml

+3 −3
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ 
            android:layout_alignLeft="@id/photo"

            android:layout_alignRight="@id/photo"

            android:background="@color/call_detail_photo_bg" />

        <ImageButton

            android:id="@+id/open_details_button"

        <ImageView

            android:id="@+id/contact_details_image"

            android:src="@drawable/ic_contacts_holo_dark"

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

            android:contentDescription="@null"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_marginRight="16dip"