am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev

* commit 'fd4df46917c79067416985ac53a3da6b27e8c333':
  Remove workaround for bug that was fixed a while ago.

2 files changed, 1 insertions, 45 deletions

diff --git a/core/java/com/android/internal/view/ImageButtonNoParentPress.java b/core/java/com/android/internal/view/ImageButtonNoParentPress.java
deleted file mode 100644
index a6cfd86..0000000
--- a/core/java/com/android/internal/view/ImageButtonNoParentPress.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-package com.android.internal.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.ViewGroup;
-import android.widget.ImageButton;
-
-public class ImageButtonNoParentPress extends ImageButton {
-
-    public ImageButtonNoParentPress(Context context) {
-        super(context);
-    }
-
-    public ImageButtonNoParentPress(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ImageButtonNoParentPress(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public void setPressed(boolean pressed) {
-        // Normally parents propagate pressed state to their children.
-        // We don't want that to happen here; only press if our parent isn't.
-        super.setPressed(((ViewGroup) getParent()).isPressed() ? false : pressed);
-    }
-}
diff --git a/core/res/res/layout/media_route_list_item.xml b/core/res/res/layout/media_route_list_item.xml
index ba1aaf2..8ce6327 100644
--- a/core/res/res/layout/media_route_list_item.xml
+++ b/core/res/res/layout/media_route_list_item.xml
@@ -49,7 +49,7 @@
                   android:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
 
-    <com.android.internal.view.ImageButtonNoParentPress
+    <ImageButton
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:id="@+id/expand_button"