Merge changes Ie09b6222,I90a0ac21 into jb-dev

<com.android.systemui.statusbar.phone.PhoneStatusBarView

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

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

    android:id="@+id/status_bar"

    android:background="@drawable/status_bar_background"

    android:orientation="vertical"

    android:focusable="true"

        <com.android.systemui.statusbar.phone.CloseDragHandle android:id="@+id/close"

            android:layout_width="match_parent"

            android:layout_height="34dp"

            android:layout_height="@dimen/close_handle_height"

            android:layout_gravity="bottom"

            android:orientation="vertical"

            >

<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 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.

*/

-->

<!-- This is the combined status bar / notification panel window. -->

<FrameLayout

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

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

    android:focusable="true"

    android:descendantFocusability="afterDescendants"

    android:fitsSystemWindows="true"

    >

    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        />

    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

        android:layout_height="@*android:dimen/status_bar_height"

        />

</FrameLayout>

    <!-- Diameter of outer shape drawable shown in navbar search-->

    <dimen name="navbar_search_outerring_diameter">300dip</dimen>

    <!-- Height of the draggable handle at the bottom of the phone notification panel -->

    <dimen name="close_handle_height">34dp</dimen>

</resources>