diff options
author | Yorke Lee <yorkelee@google.com> | 2015-02-04 17:35:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-04 17:35:29 +0000 |
commit | 0f010049bb2acb27e293022b8b3112f9f296138a (patch) | |
tree | e86fb2ade9918589863da387dcab26ee1c1fc23b | |
parent | c5a55e5d6b91faf7ece0030f9d1d0d172924c957 (diff) | |
parent | ae6302b51b1f03ddd4865539b071ba2a661b977f (diff) |
Merge "Convert unnecessary RelativeLayout to FrameLayout"
-rw-r--r-- | res/layout/speed_dial_fragment.xml | 7 | ||||
-rw-r--r-- | src/com/android/dialer/list/SpeedDialFragment.java | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/res/layout/speed_dial_fragment.xml b/res/layout/speed_dial_fragment.xml index 58a7b2410..18820497e 100644 --- a/res/layout/speed_dial_fragment.xml +++ b/res/layout/speed_dial_fragment.xml @@ -14,13 +14,10 @@ limitations under the License. --> -<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers --> -<RelativeLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:divider="?android:attr/dividerHorizontal" - android:showDividers="end" android:clipChildren="false"> <FrameLayout @@ -51,4 +48,4 @@ layout="@layout/empty_list_view" android:visibility="gone"/> -</RelativeLayout> +</FrameLayout> diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java index 6de0759fa..e72b25059 100644 --- a/src/com/android/dialer/list/SpeedDialFragment.java +++ b/src/com/android/dialer/list/SpeedDialFragment.java @@ -39,10 +39,11 @@ import android.view.animation.LayoutAnimationController; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; +import android.widget.FrameLayout; +import android.widget.FrameLayout.LayoutParams; import android.widget.ImageView; import android.widget.ListView; import android.widget.RelativeLayout; -import android.widget.RelativeLayout.LayoutParams; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.ContactTileLoaderFactory; @@ -244,7 +245,7 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener, final int listViewVisibility = visible ? View.GONE : View.VISIBLE; if (previousVisibility != emptyViewVisibility) { - final RelativeLayout.LayoutParams params = (LayoutParams) mContactTileFrame + final FrameLayout.LayoutParams params = (LayoutParams) mContactTileFrame .getLayoutParams(); params.height = visible ? LayoutParams.WRAP_CONTENT : LayoutParams.MATCH_PARENT; mContactTileFrame.setLayoutParams(params); |