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

Commit d0fa371f authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Add a new "activated" state to View. 

Use this in ListView and GridView if the top view is not checkable.

This allows PreferenceActivity to now highlight the current heading
that is being shown.

Change-Id: I0d28aded9a61a42962b4aece420ae4058712d963
parent 53b34a09

api/current.xml

+73 −1
Original line number Diff line number Diff line
@@ -2242,6 +2242,17 @@ 
 visibility="public"

>

</field>

<field name="activatedBackgroundIndicator"

 type="int"

 transient="false"

 volatile="false"

 value="16843582"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="activityCloseEnterAnimation"

 type="int"

 transient="false"
@@ -9117,6 +9128,17 @@ 
 visibility="public"

>

</field>

<field name="state_activated"

 type="int"

 transient="false"

 volatile="false"

 value="16843583"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="state_active"

 type="int"

 transient="false"
@@ -16271,7 +16293,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="17039408"

 value="17039393"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -197603,6 +197625,19 @@ 
<parameter name="container" type="android.util.SparseArray&lt;android.os.Parcelable&gt;">

</parameter>

</method>

<method name="dispatchSetActivated"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="activated" type="boolean">

</parameter>

</method>

<method name="dispatchSetPressed"

 return="void"

 abstract="false"
@@ -198972,6 +199007,17 @@ 
<parameter name="drawable" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="isActivated"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isClickable"

 return="boolean"

 abstract="false"
@@ -200207,6 +200253,19 @@ 
<parameter name="event" type="android.view.accessibility.AccessibilityEvent">

</parameter>

</method>

<method name="setActivated"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="activated" type="boolean">

</parameter>

</method>

<method name="setAlpha"

 return="void"

 abstract="false"
@@ -203073,6 +203132,19 @@ 
<parameter name="container" type="android.util.SparseArray&lt;android.os.Parcelable&gt;">

</parameter>

</method>

<method name="dispatchSetActivated"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="activated" type="boolean">

</parameter>

</method>

<method name="dispatchSetSelected"

 return="void"

 abstract="false"

core/java/android/preference/PreferenceActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ public abstract class PreferenceActivity extends ListActivity implements 
            View view;



            if (convertView == null) {

                view = mInflater.inflate(com.android.internal.R.layout.preference_list_item,

                view = mInflater.inflate(com.android.internal.R.layout.preference_header_item,

                        parent, false);

                holder = new HeaderViewHolder();

                holder.icon = (ImageView) view.findViewById(com.android.internal.R.id.icon);
@@ -446,6 +446,9 @@ public abstract class PreferenceActivity extends ListActivity implements 
            if (!mSinglePane) {

                // Multi-pane.

                getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);

                if (mCurHeader != null) {

                    setSelectedHeader(mCurHeader);

                }

                mPrefsContainer.setVisibility(View.VISIBLE);

            }

        } else {

core/java/android/view/View.java

+209 −121

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/ViewGroup.java

+13 −0
Original line number Diff line number Diff line
@@ -2066,6 +2066,19 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        }

    }



    /**

     * {@inheritDoc}

     */

    @Override

    public void dispatchSetActivated(boolean activated) {

        final View[] children = mChildren;

        final int count = mChildrenCount;

        for (int i = 0; i < count; i++) {



            children[i].setActivated(activated);

        }

    }



    @Override

    protected void dispatchSetPressed(boolean pressed) {

        final View[] children = mChildren;

core/java/android/widget/GridView.java

+3 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,9 @@ public class GridView extends AbsListView { 
        if (mChoiceMode != CHOICE_MODE_NONE && mCheckStates != null) {

            if (child instanceof Checkable) {

                ((Checkable) child).setChecked(mCheckStates.get(position));

            } else if (getContext().getApplicationInfo().targetSdkVersion

                    >= android.os.Build.VERSION_CODES.HONEYCOMB) {

                child.setActivated(mCheckStates.get(position));

            }

        }