Merge "Fix touch target for settings icon" into mnc-dev

            android:scaleType="centerInside"/>

    </com.android.systemui.statusbar.phone.MultiUserSwitch>

    <com.android.keyguard.AlphaOptimizedLinearLayout

    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

        android:id="@+id/settings_button_container"

        android:layout_width="48dp"

        android:layout_height="@dimen/status_bar_header_height"

        android:paddingStart="12dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_toStartOf="@id/multi_user_switch">

        <com.android.systemui.statusbar.phone.SettingsButton android:id="@+id/settings_button"

            style="@android:style/Widget.Material.Button.Borderless"

            android:layout_width="24dp"

            android:layout_height="@dimen/status_bar_header_height"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/ripple_drawable"

            android:src="@drawable/ic_settings"

            android:contentDescription="@string/accessibility_desc_settings" />

        <com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/tuner_icon"

            android:layout_width="12dp"

            android:layout_height="@dimen/status_bar_header_height"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingStart="36dp"

            android:tint="#4DFFFFFF"

            android:tintMode="src_in"

            android:visibility="invisible"

            android:src="@drawable/tuner" />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

    </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

    <LinearLayout android:id="@+id/system_icons_super_container"

        android:layout_width="wrap_content"