Merge "Fixed the layout of media heads up notifications" into qt-r1-dev

         */

        @Override

        public RemoteViews makeHeadsUpContentView(boolean increasedHeight) {

            RemoteViews expanded = makeMediaBigContentView();

            return expanded != null ? expanded : makeMediaContentView();

            return makeMediaContentView();

        }

        /** @hide */

  ~ limitations under the License

  -->

<FrameLayout

<com.android.internal.widget.MediaNotificationView

    android:id="@+id/status_bar_latest_event_content"

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

    android:layout_width="match_parent"

    android:tag="media"

    >

    <ImageView android:id="@+id/right_icon"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:adjustViewBounds="true"

        android:layout_gravity="top|end"

        android:scaleType="centerCrop"

            android:layout_alignParentBottom="true"

        />

    </LinearLayout>

</FrameLayout>

</com.android.internal.widget.MediaNotificationView>

    <dimen name="notification_expand_button_padding_top">1dp</dimen>

    <!-- Height of a small notification in the status bar -->

    <dimen name="notification_min_height">92dp</dimen>

    <dimen name="notification_min_height">106dp</dimen>

    <!-- The width of the big icons in notifications. -->

    <dimen name="notification_large_icon_width">64dp</dimen>

  <java-symbol type="string" name="config_displayLightSensorType" />

  <java-symbol type="drawable" name="iconfactory_adaptive_icon_drawable_wrapper"/>

  <java-symbol type="dimen" name="notification_min_height" />

  <java-symbol type="dimen" name="resolver_icon_size"/>

  <java-symbol type="dimen" name="resolver_badge_size"/>

  <java-symbol type="dimen" name="resolver_button_bar_spacing"/>

    <dimen name="status_bar_connected_device_bt_indicator_size">17dp</dimen>

    <!-- Height of a small notification in the status bar-->

    <dimen name="notification_min_height">106dp</dimen>

    <dimen name="notification_min_height">@*android:dimen/notification_min_height</dimen>

    <!-- Increased height of a small notification in the status bar -->

    <dimen name="notification_min_height_increased">146dp</dimen>