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

Commit e494662c authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Add back legacy layout for preference framework for compatibility. 

Bug: 3184831

Copied holo layouts to *_holo.xml and restored the old layouts for
non-holo (pre-honeycomb) apps to use so that their layout assumptions
aren't messed up.

Change-Id: If4dcef16191a47a4b101da6bfb0c2df1757d1ae4
parent 598913a6

core/java/android/preference/Preference.java

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis 
     * @see #Preference(Context, AttributeSet, int)

     */

    public Preference(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

        this(context, attrs, com.android.internal.R.attr.preferenceStyle);

    }



    /**

core/res/res/layout/preference.xml

+10 −17
Original line number Diff line number Diff line
@@ -24,23 +24,17 @@ 
    android:gravity="center_vertical"

    android:paddingRight="?android:attr/scrollbarSize">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="@dimen/preference_widget_width"

        android:gravity="center"

        android:orientation="horizontal">

    <ImageView

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        />

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="15dip"

        android:layout_marginRight="6dip"

        android:layout_marginTop="6dip"

        android:layout_marginBottom="6dip"
@@ -50,7 +44,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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

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

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />
@@ -69,8 +63,7 @@ 
    <LinearLayout android:id="@+android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="@dimen/preference_widget_width"

        android:gravity="center"

        android:gravity="center_vertical"

        android:orientation="vertical" />



</LinearLayout>

core/res/res/layout/preference_category.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ 
<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    style="?android:attr/listSeparatorTextViewStyle"

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

    android:paddingLeft="32dp"

/>

core/res/res/layout/preference_category_holo.xml

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

-->



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

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

    style="?android:attr/listSeparatorTextViewStyle"

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

    android:paddingLeft="32dp"

/>

core/res/res/layout/preference_child_holo.xml

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

-->



<!-- 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:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:paddingLeft="16dip"

    android:paddingRight="?android:attr/scrollbarSize">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="@dimen/preference_widget_width"

        android:gravity="center"

        android:orientation="horizontal">

        <ImageView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            />

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginRight="6dip"

        android:layout_marginTop="6dip"

        android:layout_marginBottom="6dip"

        android:layout_weight="1">



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

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

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />

            

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

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

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

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

            android:maxLines="4" />



    </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="@dimen/preference_widget_width"

        android:gravity="center"

        android:orientation="vertical" />



</LinearLayout>