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

Commit c5310446 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev

parents 0063d51c a81f9e4b
Loading
Loading
Loading
Loading
+0 −34
Original line number Diff line number Diff line
@@ -18,38 +18,4 @@
    <style name="KeyguardAppWidgetItem">
        <item name="android:textSize">16sp</item>
    </style>

    <style name="wifi_item">
        <item name="android:layout_marginTop">8dip</item>
        <item name="android:layout_marginStart">8dip</item>
        <item name="android:layout_marginEnd">8dip</item>
        <item name="android:paddingStart">8dip</item>
        <item name="android:paddingEnd">8dip</item>
        <item name="android:orientation">vertical</item>
        <item name="android:gravity">start</item>
    </style>

    <style name="wifi_item_label">
        <item name="android:paddingStart">8dip</item>
        <item name="android:textSize">14sp</item>
        <item name="android:textAlignment">viewStart</item>
        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
        <item name="android:textColor">?android:attr/textColorSecondary</item>
    </style>

    <style name="wifi_item_content">
        <item name="android:textAlignment">viewStart</item>
        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>

    <style name="wifi_item_edit_content">
        <item name="android:paddingStart">4dip</item>
        <item name="android:layout_marginStart">4dip</item>
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_section">
        <item name="android:orientation">vertical</item>
    </style>
</resources>
+0 −34
Original line number Diff line number Diff line
@@ -18,38 +18,4 @@
    <style name="KeyguardAppWidgetItem">
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_item">
        <item name="android:layout_marginTop">8dip</item>
        <item name="android:layout_marginStart">8dip</item>
        <item name="android:layout_marginEnd">8dip</item>
        <item name="android:paddingStart">8dip</item>
        <item name="android:paddingEnd">8dip</item>
        <item name="android:orientation">vertical</item>
        <item name="android:gravity">start</item>
    </style>

    <style name="wifi_item_label">
        <item name="android:paddingStart">8dip</item>
        <item name="android:textSize">14sp</item>
        <item name="android:textAlignment">viewStart</item>
        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
        <item name="android:textColor">?android:attr/textColorSecondary</item>
    </style>

    <style name="wifi_item_content">
        <item name="android:textAlignment">viewStart</item>
        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>

    <style name="wifi_item_edit_content">
        <item name="android:paddingStart">4dip</item>
        <item name="android:layout_marginStart">4dip</item>
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_section">
        <item name="android:orientation">vertical</item>
    </style>
</resources>
+0 −37
Original line number Diff line number Diff line
@@ -20,43 +20,6 @@
        <item name="android:windowNoTitle">true</item>
    </style>

    <style name="wifi_item">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_marginTop">8dip</item>
        <item name="android:layout_marginStart">16dip</item>
        <item name="android:layout_marginEnd">16dip</item>
        <item name="android:orientation">vertical</item>
        <item name="android:gravity">center_vertical</item>
    </style>

    <style name="wifi_item_label">
        <item name="android:layout_width">0dip</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_weight">3</item>
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_item_content">
        <item name="android:layout_width">0dip</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_weight">7</item>
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_item_edit_content">
        <item name="android:layout_width">0dip</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_weight">7</item>
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_section">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>
        <item name="android:orientation">vertical</item>
    </style>

    <style name="setup_wizard_button">
        <item name="android:layout_width">wrap_content</item>
        <item name="android:minWidth">208dip</item>
+0 −34
Original line number Diff line number Diff line
@@ -18,38 +18,4 @@
    <style name="KeyguardAppWidgetItem">
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_item">
        <item name="android:layout_marginTop">8dip</item>
        <item name="android:layout_marginStart">8dip</item>
        <item name="android:layout_marginEnd">8dip</item>
        <item name="android:paddingStart">8dip</item>
        <item name="android:paddingEnd">8dip</item>
        <item name="android:orientation">vertical</item>
        <item name="android:gravity">start</item>
    </style>

    <style name="wifi_item_label">
        <item name="android:paddingStart">8dip</item>
        <item name="android:textSize">14sp</item>
        <item name="android:textAlignment">viewStart</item>
        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
        <item name="android:textColor">?android:attr/textColorSecondary</item>
    </style>

    <style name="wifi_item_content">
        <item name="android:textAlignment">viewStart</item>
        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>

    <style name="wifi_item_edit_content">
        <item name="android:paddingStart">4dip</item>
        <item name="android:layout_marginStart">4dip</item>
        <item name="android:textSize">18sp</item>
    </style>

    <style name="wifi_section">
        <item name="android:orientation">vertical</item>
    </style>
</resources>