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

Commit f7560321 authored by Katherine Kuan's avatar Katherine Kuan Committed by Android (Google) Code Review
Browse files

Merge "Fix misc font sizes and spacing issues"

parents be7a9d51 507d8517

res/layout/contact_tile_starred.xml

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
                android:paddingBottom="4dip"

                android:fadingEdge="horizontal"

                android:fadingEdgeLength="3dip"

                android:layout_marginTop="-3dip"

                android:ellipsize="marquee" />



        </LinearLayout>

res/layout/contact_tile_starred_quick_contact.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
                android:drawablePadding="4dip"

                android:fadingEdge="horizontal"

                android:fadingEdgeLength="3dip"

                android:layout_marginTop="-3dip"

                android:ellipsize="marquee" />



        </LinearLayout>

res/layout/select_dialog_item.xml

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

-->



<!--

  List item in the pop-up window that appears when tapping a contact's photo

  in the contact editor. This is similar to the framework's select_dialog_item.xml layout

  except the text appearance is medium.

-->

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="48dip"

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

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

    android:gravity="center_vertical"

    android:paddingLeft="14dip"

    android:paddingRight="15dip"

    android:ellipsize="marquee"

/>

src/com/android/contacts/editor/PhotoActionPopup.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class PhotoActionPopup { 
                    context.getString(resId)));

        }

        final ListAdapter adapter = new ArrayAdapter<ChoiceListItem>(context,

                android.R.layout.select_dialog_item, choices);

                R.layout.select_dialog_item, choices);



        final ListPopupWindow listPopupWindow = new ListPopupWindow(context);

        final OnItemClickListener clickListener = new OnItemClickListener() {