Merge "Keyboard shortcuts: new layout for keys container" into nyc-dev

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingEnd="12dp"

            android:background="@android:color/white"

            android:textColor="#D9000000"

            android:textColor="@color/ksh_keyword_color"

            android:textSize="16sp"

            android:maxLines="5"

            android:singleLine="false"

            android:scrollHorizontally="false"

            android:layout_alignParentStart="true"

            android:minWidth="100dp"

            android:maxWidth="260dp"/>

    <!--TODO: introduce and use a layout that allows wrapping and right align -->

    <LinearLayout

            android:layout_alignParentStart="true"/>

    <com.android.systemui.statusbar.KeyboardShortcutKeysLayout

            android:id="@+id/keyboard_shortcuts_item_container"

            android:layout_toEndOf="@+id/keyboard_shortcuts_keyword"

            android:orientation="horizontal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:background="@android:color/white"

            android:layout_alignParentEnd="true"

            android:gravity="end"

            android:textSize="14sp"

            android:paddingStart="0dp"

            android:paddingEnd="0dp"

            android:scrollHorizontally="false"

            android:minWidth="100dp"

            android:maxWidth="260dp"/>

            android:scrollHorizontally="false"/>

</RelativeLayout>

<FrameLayout

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

    android:layout_width="488dp"

    android:layout_width="@dimen/ksh_layout_width"

    android:layout_height="wrap_content">

    <LinearLayout

        android:layout_width="match_parent"

    <!-- The side padding for the task stack. -->

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

    <!-- Keyboard shortcuts helper -->

    <dimen name="ksh_layout_width">488dp</dimen>

</resources>

    <!-- Keyboard shortcuts colors -->

    <color name="ksh_system_group_color">#ff00bcd4</color>

    <color name="ksh_application_group_color">#fff44336</color>

    <color name="ksh_keyword_color">#d9000000</color>

    <!-- Background color of edit overflow -->

    <color name="qs_edit_overflow_bg">#455A64</color>

    <dimen name="battery_detail_graph_space_top">27dp</dimen>

    <dimen name="battery_detail_graph_space_bottom">27dp</dimen>

    <!-- Keyboard shortcuts helper -->

    <dimen name="ksh_layout_width">@dimen/match_parent</dimen>

</resources>