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

Commit cd79d036 authored by Flavio Lerda's avatar Flavio Lerda Committed by Android (Google) Code Review
Browse files

Merge "More fixes for push-states."

parents fbb87639 8e683e8e

res/layout/call_log_fragment.xml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
     limitations under the License.

-->



<!-- Layout parameters are set programmatically. -->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

res/layout/contact_detail_network_title_entry_view.xml

+29 −22
Original line number Diff line number Diff line
@@ -17,14 +17,21 @@ 
 */

-->



<LinearLayout

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/detail_item_side_margin"

    android:paddingRight="@dimen/detail_item_side_margin"

    android:paddingRight="@dimen/detail_item_side_margin">

    <LinearLayout

        android:id="@+id/primary_action_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/detail_item_vertical_margin"

        android:paddingBottom="@dimen/detail_item_vertical_margin"

        android:focusable="true"

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

        android:minHeight="@dimen/detail_min_line_item_height"

        android:orientation="horizontal"

        android:gravity="center_vertical">
@@ -43,5 +50,5 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

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



    </LinearLayout>

</FrameLayout>

res/layout/contact_tile_frequent.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
    class="com.android.contacts.list.ContactTileView"

    android:focusable="true"

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

    android:nextFocusRight="@+id/contact_tile_quick"

    android:paddingRight="16dip"

    android:paddingLeft="16dip" >

    android:nextFocusRight="@+id/contact_tile_quick">



    <RelativeLayout

        android:layout_width="match_parent"

res/layout/contact_tile_frequent_phone.xml

+4 −4
Original line number Diff line number Diff line
@@ -13,15 +13,15 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Layout parameters are set programmatically. -->

<view

    android:id="@+id/contact_tile_frequent_phone"

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

    android:id="@+id/contact_tile_frequent_phone"

    class="com.android.contacts.list.ContactTileDarkFrequentView"

    android:focusable="true"

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

    android:nextFocusLeft="@+id/contact_tile_quick"

    android:paddingRight="16dip"

    android:paddingLeft="16dip" >

    android:nextFocusLeft="@+id/contact_tile_quick">



    <RelativeLayout

        android:layout_width="match_parent"

src/com/android/contacts/detail/ContactDetailFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen 
            this.mIcon = icon;

            this.mLabel = label;

            this.mOnClickListener = onClickListener;

            this.isEnabled = onClickListener != null;

            this.isEnabled = false;

        }



        public static NetworkTitleViewEntry fromAccountType(Context context, AccountType type) {
@@ -1554,6 +1554,8 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen 
                        parent, false);

                viewCache = new NetworkTitleViewCache(result);

                result.setTag(viewCache);

                result.findViewById(R.id.primary_action_view).setOnClickListener(

                        entry.mOnClickListener);

            }



            viewCache.name.setText(entry.getLabel());