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

Commit 5062649a authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Update list item text appearance"

parents 30439d62 55565ecd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1132,6 +1132,7 @@ package android { 
    field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043

    field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301

    field public static final int textAppearanceListItem = 16843678; // 0x101039e

    field public static final int textAppearanceListItemSecondary = 16843838; // 0x101043e

    field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f

    field public static final int textAppearanceMedium = 16842817; // 0x1010041

    field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044

core/java/android/preference/Preference.java

+7 −3
Original line number Diff line number Diff line
@@ -533,8 +533,7 @@ public class Preference implements Comparable<Preference> { 
     * @see #onCreateView(ViewGroup)

     */

    protected void onBindView(View view) {

        final TextView titleView = (TextView) view.findViewById(

                com.android.internal.R.id.title);

        final TextView titleView = (TextView) view.findViewById(com.android.internal.R.id.title);

        if (titleView != null) {

            final CharSequence title = getTitle();

            if (!TextUtils.isEmpty(title)) {
@@ -557,7 +556,7 @@ public class Preference implements Comparable<Preference> { 
            }

        }



        ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);

        final ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);

        if (imageView != null) {

            if (mIconResId != 0 || mIcon != null) {

                if (mIcon == null) {
@@ -570,6 +569,11 @@ public class Preference implements Comparable<Preference> { 
            imageView.setVisibility(mIcon != null ? View.VISIBLE : View.GONE);

        }



        final View imageFrame = view.findViewById(com.android.internal.R.id.icon_frame);

        if (imageFrame != null) {

            imageFrame.setVisibility(mIcon != null ? View.VISIBLE : View.GONE);

        }



        if (mShouldDisableView) {

            setEnabledStateOnViews(view, isEnabled());

        }

core/res/res/layout/preference_category_quantum.xml

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

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

-->



<!-- Layout used for PreferenceCategory in a PreferenceActivity. -->

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

    android:id="@+android:id/title"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginBottom="16dip"

    android:textAppearance="@style/TextAppearance.Quantum.Body2"

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

    android:textStyle="bold"

    android:paddingStart="?attr/listPreferredItemPaddingStart"

    android:paddingEnd="?attr/listPreferredItemPaddingEnd"

    android:paddingTop="16dip" />

core/res/res/layout/preference_child_quantum.xml

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

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

-->



<!-- Layout for a visually child-like Preference in a PreferenceActivity. -->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginStart="?attr/listPreferredItemPaddingStart"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:paddingStart="?attr/listPreferredItemPaddingStart"

    android:paddingEnd="?attr/listPreferredItemPaddingEnd">



    <LinearLayout

        android:id="@+android:id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="58dip"

        android:gravity="left|center_vertical"

        android:orientation="horizontal">

        <ImageView

            android:id="@+android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="8dip" />

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dip"

        android:paddingBottom="16dip">



        <TextView android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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



        <TextView android:id="@+android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/title"

            android:layout_alignStart="@android:id/title"

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

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

            android:maxLines="10" />



    </RelativeLayout>



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout android:id="@+android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="58dip"

        android:gravity="right|center_vertical"

        android:orientation="vertical" />



</LinearLayout>

core/res/res/layout/preference_information_quantum.xml

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

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

-->



<!-- Layout for a Preference in a PreferenceActivity. The

     Preference is able to place a specific widget for its particular

     type in the "widget_frame" layout. -->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:paddingStart="?attr/listPreferredItemPaddingStart"

    android:paddingEnd="?attr/listPreferredItemPaddingEnd">



    <LinearLayout

        android:id="@+android:id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="58dip"

        android:gravity="left|center_vertical"

        android:orientation="horizontal">

        <ImageView

            android:id="@+android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="8dip" />

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dip"

        android:paddingBottom="16dip">



        <TextView android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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



        <TextView android:id="@+android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/title"

            android:layout_alignStart="@android:id/title"

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

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

            android:maxLines="10" />



    </RelativeLayout>



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout android:id="@+android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="58dip"

        android:gravity="right|center_vertical"

        android:orientation="vertical" />



</LinearLayout>