Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d757d6bf authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix large text setting for QS" into lmp-dev

parents 87078b73 e17c4b49

packages/SystemUI/res/layout/data_usage.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<com.android.systemui.qs.tiles.DataUsageDetailView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="16dp"
@@ -82,4 +82,4 @@ 
            android:textAppearance="@style/TextAppearance.QS.DataUsage.Secondary" />

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file
 
</com.android.systemui.qs.tiles.DataUsageDetailView>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_user_detail_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
            android:id="@+id/user_name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="14sp"

            android:textSize="@dimen/qs_detail_item_secondary_text_size"

            android:textColor="@color/qs_user_detail_name"

            android:gravity="center_horizontal" />

packages/SystemUI/res/layout/split_clock_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


    <!-- Empty text view so we have the same height when expanded/collapsed-->

    <TextView

        android:id="@+id/empty_time_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:visibility="invisible"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
        android:visibility="gone"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.EmergencyCallsOnly"

        android:text="@*android:string/emergency_calls_only"

        android:singleLine="true"

        android:gravity="center_vertical" />



    <FrameLayout

packages/SystemUI/res/values/dimens.xml

+17 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
    <dimen name="qs_dual_tile_padding_vertical">8dp</dimen>

    <dimen name="qs_dual_tile_padding_horizontal">6dp</dimen>

    <dimen name="qs_tile_padding_top">16dp</dimen>

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

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

    <dimen name="qs_tile_padding_bottom">16dp</dimen>

    <dimen name="qs_tile_spacing">4dp</dimen>
@@ -173,7 +174,13 @@ 
    <dimen name="qs_detail_item_height">48dp</dimen>

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

    <dimen name="qs_brightness_padding_top">6dp</dimen>



    <dimen name="qs_detail_header_text_size">20sp</dimen>

    <dimen name="qs_detail_button_text_size">14sp</dimen>

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

    <dimen name="qs_detail_item_secondary_text_size">14sp</dimen>

    <dimen name="qs_detail_empty_text_size">14sp</dimen>

    <dimen name="qs_data_usage_text_size">14sp</dimen>

    <dimen name="qs_data_usage_usage_text_size">36sp</dimen>



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

    <dimen name="segmented_button_radius">2dp</dimen>
@@ -368,6 +375,9 @@ 
    <!-- The padding bottom of the clock group when QS is collapsed. -->

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



    <!-- The padding bottom of the clock group when QS is collapsed for large text -->

    <dimen name="clock_collapsed_bottom_margin_large_text">6dp</dimen>



    <!-- The width of the multi user switch on keyguard and collapsed QS header. -->

    <dimen name="multi_user_switch_width_collapsed">34dp</dimen>
@@ -389,6 +399,12 @@ 
    <!-- The font size of the time when expanded in QS -->

    <dimen name="qs_time_expanded_size">20sp</dimen>



    <!-- The font size of the "emergency calls only" label in QS -->

    <dimen name="qs_emergency_calls_only_text_size">12sp</dimen>



    <!-- The font size of the date in QS -->

    <dimen name="qs_date_collapsed_size">14sp</dimen>



    <!-- Battery level padding end when in expanded QS (but not on Keyguard) -->

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