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

Commit cb157431 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev

parents 5eb4edad 4a2acd2e

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -678,7 +678,8 @@ 
        <activity android:name=".localepicker.LocalePickerWithRegionActivity"

                  android:excludeFromRecents="true"

                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:exported="false">

                  android:exported="false"

                  android:theme="@style/Theme.LocalePickerWithRegionActivity">

        </activity>



        <activity

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
        <item name="android:layout_marginStart">4dip</item>

        <item name="android:textAlignment">viewStart</item>

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>

        <item name="android:textColorHint">?android:attr/textColorSecondary</item>

        <item name="android:minHeight">@dimen/min_tap_target_size</item>

    </style>

res/values/themes.xml

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
        <item name="android:navigationBarColor">@android:color/transparent</item>

        <item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>

        <item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBarStyle</item>

        <item name="android:textColorHint">?android:attr/textColorSecondary</item>



        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>

        <item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -93,6 +92,10 @@ 
        <item name="android:backgroundDimEnabled">false</item>

    </style>



    <style name="Theme.LocalePickerWithRegionActivity" parent="Theme.Settings">

        <item name="android:textColorHint">?android:attr/textColorSecondary</item>

    </style>



    <style name="ThemeOverlay.SwitchBar.Settings.Base" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">

        <item name="android:elevation">1dp</item>

        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>