Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev

        android:gravity="center"

        android:forceHasOverlappingRendering="false"

        android:layout_gravity="bottom"

        android:layout_marginBottom="@dimen/transient_taskbar_margin"

        android:layout_marginBottom="@dimen/transient_taskbar_bottom_margin"

        android:clipChildren="false" />

    <com.android.launcher3.taskbar.TaskbarScrimView

    <dimen name="allset_page_allset_text_size">42sp</dimen>

    <dimen name="allset_page_swipe_up_text_size">16sp</dimen>

    <!-- Transient taskbar -->

    <dimen name="transient_taskbar_size">76dp</dimen>

    <dimen name="transient_taskbar_icon_size">52dp</dimen>

    <!-- Taskbar swipe up thresholds -->

    <dimen name="taskbar_from_nav_threshold">30dp</dimen>

    <dimen name="taskbar_app_window_threshold">100dp</dimen>

    <!-- Taskbar -->

    <!-- Align the Taskbar to the start (Left/Right) of the device when 3 button nav is enabled. -->

    <bool name="start_align_taskbar">false</bool>

    <!-- This is a float because it is converted to dp later in DeviceProfile -->

    <item name="taskbar_icon_size" type="dimen" format="float">44</item>

</resources>

    <!-- Taskbar -->

    <dimen name="taskbar_size">@*android:dimen/taskbar_frame_height</dimen>

    <dimen name="taskbar_ime_size">48dp</dimen>

    <dimen name="taskbar_icon_size">44dp</dimen>

    <dimen name="taskbar_icon_min_touch_size">48dp</dimen>

    <!-- Note that this applies to both sides of all icons, so visible space is double this. -->

    <dimen name="taskbar_icon_spacing">12dp</dimen>

    <!-- Transient taskbar -->

    <dimen name="transient_taskbar_size">72dp</dimen>

    <dimen name="transient_taskbar_padding">12dp</dimen>

    <dimen name="transient_taskbar_min_width">150dp</dimen>

    <dimen name="transient_taskbar_icon_size">48dp</dimen>

    <dimen name="transient_taskbar_margin">24dp</dimen>

    <dimen name="transient_taskbar_bottom_margin">24dp</dimen>

    <dimen name="transient_taskbar_shadow_blur">40dp</dimen>

    <dimen name="transient_taskbar_key_shadow_distance">10dp</dimen>

    <dimen name="transient_taskbar_stashed_size">32dp</dimen>

    <dimen name="transient_taskbar_stashed_height">32dp</dimen>

    <dimen name="transient_taskbar_all_apps_button_translation_x_offset">4dp</dimen>

    <dimen name="transient_taskbar_stash_spring_velocity_dp_per_s">400dp</dimen>

    @Override

    public void init(TaskbarControllers controllers) {

        mControllers = controllers;

        mNavButtonsView.getLayoutParams().height = mContext.getDeviceProfile().taskbarSize;

        mNavButtonsView.getLayoutParams().height = mContext.getDeviceProfile().taskbarHeight;

        // Quick settings and notifications buttons

        addButton(R.drawable.ic_sysbar_quick_settings, BUTTON_QUICK_SETTINGS,