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

Commit 371384f3 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Theming for Device Management Dialog

Test: manual: connect to VPN and change style
Fixes: 126820152
Change-Id: I91d59aac21508102d716cb1404096dbbb477628f
parent 72f3872b
Loading
Loading
Loading
Loading
+8 −20
Original line number Diff line number Diff line
@@ -39,17 +39,14 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/monitoring_title_device_owned"
                style="@style/TextAppearance.DeviceManagementDialog.Title"
                android:textColor="?android:attr/textColorPrimary"
                style="@style/DeviceManagementDialogTitle"
                android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
            />
            <TextView
                android:id="@+id/device_management_warning"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@null"
                style="@android:style/TextAppearance.Material.Subhead"
                android:textColor="?android:attr/textColorPrimary"
                android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
            />
        </LinearLayout>

@@ -64,17 +61,14 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/monitoring_subtitle_ca_certificate"
                style="@style/TextAppearance.DeviceManagementDialog.Title"
                android:textColor="?android:attr/textColorPrimary"
                style="@style/DeviceManagementDialogTitle"
                android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
            />
            <TextView
                android:id="@+id/ca_certs_warning"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@null"
                style="@android:style/TextAppearance.Material.Subhead"
                android:textColor="?android:attr/textColorPrimary"
                android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
            />
        </LinearLayout>

@@ -89,17 +83,14 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/monitoring_subtitle_network_logging"
                style="@style/TextAppearance.DeviceManagementDialog.Title"
                android:textColor="?android:attr/textColorPrimary"
                style="@style/DeviceManagementDialogTitle"
                android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
            />
            <TextView
                android:id="@+id/network_logging_warning"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@null"
                style="@android:style/TextAppearance.Material.Subhead"
                android:textColor="?android:attr/textColorPrimary"
                android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
            />
        </LinearLayout>

@@ -114,17 +105,14 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/monitoring_subtitle_vpn"
                style="@style/TextAppearance.DeviceManagementDialog.Title"
                android:textColor="?android:attr/textColorPrimary"
                style="@style/DeviceManagementDialogTitle"
                android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
            />
            <TextView
                android:id="@+id/vpn_warning"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@null"
                style="@android:style/TextAppearance.Material.Subhead"
                android:textColor="?android:attr/textColorPrimary"
                android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
            />
        </LinearLayout>
    </LinearLayout>
+10 −1
Original line number Diff line number Diff line
@@ -239,10 +239,19 @@
        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
    </style>

    <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
    <style name="TextAppearance.DeviceManagementDialog">
        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>

    <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>

    <style name="DeviceManagementDialogTitle">
        <item name="android:gravity">center</item>
        <item name="android:textAppearance">@style/TextAppearance.DeviceManagementDialog.Title</item>
    </style>

    <style name="TextAppearance.DeviceManagementDialog.Content" parent="@*android:style/TextAppearance.DeviceDefault.Subhead"/>

    <style name="BaseBrightnessDialogContainer" parent="@style/Theme.SystemUI">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">wrap_content</item>