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

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

Some improvements to ListFragment. 

- Take care of hiding/showing list automatically for normal behavior.
- Make list_content public for others to use.

Change-Id: Iecb7b70775d390d4e28e5c0dd6ba7278581b2734
parent 83356193

api/current.xml

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

>

</field>

<field name="list_content"

 type="int"

 transient="false"

 volatile="false"

 value="17367073"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="preference_category"

 type="int"

 transient="false"
@@ -28465,7 +28476,18 @@ 
>

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

</parameter>

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

</method>

<method name="setListShownNoAnimation"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setSelection"

core/java/android/app/ListActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class ListActivity extends Activity { 
        if (mList != null) {

            return;

        }

        setContentView(com.android.internal.R.layout.list_content);

        setContentView(com.android.internal.R.layout.list_content_simple);



    }

core/java/android/app/ListFragment.java

+46 −2
Original line number Diff line number Diff line
@@ -172,11 +172,17 @@ public class ListFragment extends Fragment { 
     * is {@link android.R.id#list android.R.id.list} and can optionally

     * have a sibling view id {@link android.R.id#empty android.R.id.empty}

     * that is to be shown when the list is empty.

     * 

     * <p>If you are overriding this method with your own custom content,

     * consider including the standard layout {@link android.R.layout#list_content}

     * in your layout file, so that you continue to retain all of the standard

     * behavior of ListFragment.  In particular, this is currently the only

     * way to have the built-in indeterminant progress state be shown.

     */

    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        return inflater.inflate(com.android.internal.R.layout.list_content_rich,

        return inflater.inflate(com.android.internal.R.layout.list_content,

                container, false);

    }
@@ -217,9 +223,15 @@ public class ListFragment extends Fragment { 
     * Provide the cursor for the list view.

     */

    public void setListAdapter(ListAdapter adapter) {

        boolean hadAdapter = mAdapter != null;

        mAdapter = adapter;

        if (mList != null) {

            mList.setAdapter(adapter);

            if (!mListShown && !hadAdapter) {

                // The list was hidden, and previously didn't have an

                // adapter.  It is now time to show it.

                setListShown(true, getView().getWindowToken() != null);

            }

        }

    }
@@ -271,6 +283,32 @@ public class ListFragment extends Fragment { 
        mList.setEmptyView(mStandardEmptyView);

    }

    

    /**

     * Control whether the list is being displayed.  You can make it not

     * displayed if you are waiting for the initial data to show in it.  During

     * this time an indeterminant progress indicator will be shown instead.

     * 

     * <p>Applications do not normally need to use this themselves.  The default

     * behavior of ListFragment is to start with the list not being shown, only

     * showing it once an adapter is given with {@link #setListAdapter(ListAdapter)}.

     * If the list at that point had not been shown, when it does get shown

     * it will be do without the user ever seeing the hidden state.

     * 

     * @param shown If true, the list view is shown; if false, the progress

     * indicator.  The initial value is true.

     */

    public void setListShown(boolean shown) {

        setListShown(shown, true);

    }

    

    /**

     * Like {@link #setListShown(boolean)}, but no animation is used when

     * transitioning from the previous state.

     */

    public void setListShownNoAnimation(boolean shown) {

        setListShown(shown, false);

    }

    

    /**

     * Control whether the list is being displayed.  You can make it not

     * displayed if you are waiting for the initial data to show in it.  During
@@ -281,7 +319,7 @@ public class ListFragment extends Fragment { 
     * @param animate If true, an animation will be used to transition to the

     * new state.

     */

    public void setListShown(boolean shown, boolean animate) {

    private void setListShown(boolean shown, boolean animate) {

        ensureList();

        if (mProgressContainer == null) {

            throw new IllegalStateException("Can't be used with a custom content view");
@@ -356,6 +394,12 @@ public class ListFragment extends Fragment { 
        mList.setOnItemClickListener(mOnClickListener);

        if (mAdapter != null) {

            setListAdapter(mAdapter);

        } else {

            // We are starting without an adapter, so assume we won't

            // have our data right away and start with the progress indicator.

            if (mProgressContainer != null) {

                setListShown(false, false);

            }

        }

        mHandler.post(mRequestFocus);

    }

core/res/res/layout/list_content.xml

+40 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/layout/list_content.xml

**

** Copyright 2006, The Android Open Source Project

/* Copyright 2010, 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.
@@ -17,8 +15,42 @@ 
** limitations under the License.

*/

-->

<ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"

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

        android:layout_width="match_parent"

        android:layout_height="match_parent">

    

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

            android:orientation="vertical"

            android:layout_width="match_parent" 

            android:layout_height="match_parent"

            android:visibility="gone"

            android:gravity="center">

        

        <ProgressBar style="?android:attr/progressBarStyleLarge"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        <TextView android:layout_width="wrap_content"

                android:layout_height="wrap_content"

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

                android:text="@string/loading"

                android:paddingTop="4dip"

                android:singleLine="true" />

            

    </LinearLayout>

        

    <FrameLayout android:id="@+id/listContainer"

            android:layout_width="match_parent" 

            android:layout_height="match_parent">

            

        <ListView android:id="@android:id/list"

                android:layout_width="match_parent" 

                android:layout_height="match_parent"

                android:drawSelectorOnTop="false" />

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

                android:layout_width="match_parent"

                android:layout_height="match_parent"

    android:drawSelectorOnTop="false"

    />
 
                android:gravity="center"

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

    </FrameLayout>

        

</FrameLayout>

core/res/res/layout/list_content_rich.xml

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

<!--

/* Copyright 2010, 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.

*/

-->

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

        android:layout_width="match_parent"

        android:layout_height="match_parent">

    

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

            android:orientation="vertical"

            android:layout_width="match_parent" 

            android:layout_height="match_parent"

            android:visibility="gone"

            android:gravity="center">

        

        <ProgressBar style="?android:attr/progressBarStyleLarge"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        <TextView android:layout_width="wrap_content"

                android:layout_height="wrap_content"

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

                android:text="@string/loading"

                android:paddingTop="4dip"

                android:singleLine="true" />

            

    </LinearLayout>

        

    <FrameLayout android:id="@+id/listContainer"

            android:layout_width="match_parent" 

            android:layout_height="match_parent">

            

        <ListView android:id="@android:id/list"

                android:layout_width="match_parent" 

                android:layout_height="match_parent"

                android:drawSelectorOnTop="false" />

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

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:gravity="center"

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

    </FrameLayout>

        

</FrameLayout>