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

Commit b84c5ce6 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'ics-mr1-release' of... 

Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/packages/apps/Contacts into aosp

Conflicts:
	res/values-ru/strings.xml
	src/com/android/contacts/dialpad/DialpadFragment.java

Change-Id: Ia2a9d651991749b2a9d7957230769e040aabaf6e
parents 7170eb8f ff5e3dbc

res/layout/call_log_fragment.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingBottom="?android:attr/actionBarSize">

    android:paddingBottom="?android:attr/actionBarSize"

    android:divider="?android:attr/dividerHorizontal"

    android:showDividers="end">



    <FrameLayout

        android:id="@+id/voicemail_status"

res/layout/dialpad_fragment.xml

+46 −11
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:layout_alignParentLeft="true"

            android:gravity="center"

            android:textAppearance="@style/DialtactsDigitsTextAppearance"

            android:textColor="?android:attr/textColorPrimary"
@@ -46,15 +45,15 @@ 
            android:background="@android:color/transparent" />



        <ImageButton

            android:id="@+id/overflow_menu"

            android:layout_width="48dip"

            android:id="@+id/deleteButton"

            android:layout_width="56dip"

            android:layout_height="match_parent"

            android:layout_alignParentRight="true"

            android:src="@drawable/ic_menu_overflow"

            android:contentDescription="@*android:string/action_menu_overflow_description"

            android:nextFocusLeft="@id/digits"

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



            android:layout_gravity="center_vertical"

            android:gravity="center"

            android:state_enabled="false"

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

            android:contentDescription="@string/description_delete_button"

            android:src="@drawable/ic_dial_action_delete" />

    </LinearLayout>



    <LinearLayout
@@ -106,8 +105,44 @@ 
       android:layout_height="@dimen/dialpad_vertical_margin"

       android:background="#66000000"/>



    <!-- Horizontal row of buttons (Search + DialButton + Delete.) -->

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

    <LinearLayout

        android:id="@+id/dialButtonContainer"

        android:layout_width="match_parent"

        android:layout_height="0px"

        android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"

        android:layout_gravity="center_horizontal"

        android:background="@drawable/dialpad_background">

        <ImageButton

            android:id="@+id/searchButton"

            android:layout_width="wrap_content"

            android:layout_height="?android:attr/actionBarSize"

            android:layout_gravity="bottom|center_horizontal"

            android:state_enabled="false"

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

            android:contentDescription="@string/description_search_button"

            android:src="@drawable/ic_dial_action_search"/>



        <ImageButton

            android:id="@+id/dialButton"

            android:layout_width="0px"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:state_enabled="false"

            android:background="@drawable/btn_call"

            android:contentDescription="@string/description_dial_button"

            android:src="@drawable/ic_dial_action_call" />



        <ImageButton

            android:id="@+id/overflow_menu"

            android:layout_width="wrap_content"

            android:layout_height="?android:attr/actionBarSize"

            android:layout_gravity="bottom|center_horizontal"

            android:src="@drawable/ic_menu_overflow"

            android:contentDescription="@*android:string/action_menu_overflow_description"

            android:nextFocusLeft="@id/digits"

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

    </LinearLayout>



    <!-- "Dialpad chooser" UI, shown only when the user brings up the

         Dialer while a call is already in progress.

res/layout/empty2.xml

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

-->



<!-- Hack for show empty hidden menu item without using android:icon.

     See dialtact_options.xml for more detail.



     TODO: figure out better way -->

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">

    <ImageView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_dial_action_search"

        android:visibility="invisible"/>

</FrameLayout>

res/layout/phone_contact_tile_list.xml

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

-->



<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingBottom="?android:attr/actionBarSize"

    android:divider="?android:attr/dividerHorizontal"

    android:showDividers="end">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <ListView

            android:id="@+id/contact_tile_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="@dimen/contact_tile_list_padding_top"

            android:clipToPadding="false"

            android:fadingEdge="none"

            android:divider="@null" />



        <TextView

            android:id="@+id/contact_tile_list_empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center_horizontal"

            android:layout_marginTop="@dimen/empty_message_top_margin"

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

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

    </FrameLayout>

</LinearLayout>

res/menu/dialtacts_options.xml

+12 −0
Original line number Diff line number Diff line
@@ -37,4 +37,16 @@ 
        android:id="@+id/add_contact"

        android:title="@string/menu_newContact"

        android:showAsAction="withText" />



    <!-- Ugly hack: empty item never clickable.

         This is for forcing search icon on left even when there's a single item

         in the bottom ActionBar.

         We intentionally don't use android:icon to avoid other issues around item with

         a null icon.



         TODO: look for better idea. -->

    <item

        android:id="@+id/fake_menu_item"

        android:actionLayout="@layout/empty2"

        android:showAsAction="ifRoom" />

</menu>